gradle-update

fixed some project errors

.gitignore

@@ -1,56 +1,15 @@
-.externalNativeBuild
-import-summary.txt
-
-*.class
-*.dex
-.sync/
-
-*.iws
-*.ipr
 *.iml
-target/
-.idea/
-.gradle/
-.disk/
-release/
-build/
-spoon/
-
-#mac temp file
-.idea/
-__MACOSX
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
-._.DS_Store
-
-#for eclipse
-.settings/
+/build
+/captures
+.externalNativeBuild
+.cxx
 local.properties
-*gen/
-*.classpath
-*/bin/
-.project
-
-#temp file
-*.bak
-
-*.pmd
-sh.exe.stackdump
-
-.vs/
-.vscode/
-
-*.log
-*.ctxt
-.mtj.tmp/
-
-hs_err_pid*
-
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-*.cxx
-*.cfg
-

app/.gitignore

@@ -1,56 +1 @@
-.externalNativeBuild
-import-summary.txt
-
-*.class
-*.dex
-.sync/
-
-*.iws
-*.ipr
-*.iml
-target/
-.idea/
-.gradle/
-.disk/
-release/
-build/
-spoon/
-
-#mac temp file
-.idea/
-__MACOSX
-.DS_Store
-._.DS_Store
-
-#for eclipse
-.settings/
-local.properties
-*gen/
-*.classpath
-*/bin/
-.project
-
-#temp file
-*.bak
-
-*.pmd
-sh.exe.stackdump
-
-.vs/
-.vscode/
-
-*.log
-*.ctxt
-.mtj.tmp/
-
-hs_err_pid*
-
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-*.cxx
-*.cfg
-
+/build

app/build.gradle

@@ -1,24 +1,30 @@
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
+    id 'org.jetbrains.kotlin.android'
 }
 
 android {
+    namespace 'com.alex.pro'
     compileSdk rootProject.ext.compileSdkVersion
-
+    buildFeatures.buildConfig = true
+    lintOptions {
+        checkReleaseBuilds true
+        quiet true
+        abortOnError false
+        ignoreWarnings true
+        textOutput "stdout"
+        textReport false
+        disable "UnusedResources", 'RestrictedApi'
+        disable 'TypographyFractions', 'TypographyQuotes'
+        enable 'RtlHardcoded', 'RtlCompat', 'RtlEnabled'
+        checkOnly 'NewApi', 'InlinedApi'
+    }
     defaultConfig {
-        if (rootProject.ext.isMasterPkg) {
-            applicationId rootProject.ext.masterPkg
-            manifestPlaceholders = [label: "Waxmoon"]
-        } else {
-            applicationId rootProject.ext.assistPkg
-            manifestPlaceholders = [label: "Waxmoon32"]
-            ndk.abiFilters 'armeabi-v7a'
-        }
+        applicationId "com.alex.pro"
         minSdk rootProject.ext.minSdkVersion
         targetSdk rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -49,29 +55,14 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion kotlin_version
+        kotlinCompilerExtensionVersion '1.5.1'
     }
-    packagingOptions {
+    packaging {
         resources {
-            excludes += '/META-INF/*'
-        }
-        jniLibs {
-            useLegacyPackaging = true
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
-    lintOptions {
-        checkReleaseBuilds true
-        quiet true
-        abortOnError false
-        ignoreWarnings true
-        textOutput "stdout"
-        textReport false
-        disable "UnusedResources", 'RestrictedApi'
-        disable 'TypographyFractions', 'TypographyQuotes'
-        enable 'RtlHardcoded', 'RtlCompat', 'RtlEnabled'
-        check 'NewApi', 'InlinedApi'
-    }
+
 }
 
 tasks.withType(Javadoc) {
@@ -82,6 +73,11 @@ tasks.withType(Javadoc) {
 }
 
 dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
+   implementation project(path: ':opensdk')
+
+
+   // compose
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
@@ -96,6 +92,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-
-    implementation project(path: ':opensdk')
 }

app/src/androidTest/java/org/waxmoon/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/alex/pro/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package org.waxmoon
+package com.alex.pro
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.waxmoon", appContext.packageName)
+        assertEquals("com.alex.pro", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.waxmoon"
-    android:sharedUserId="org.waxmoon.github">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--高危权限-->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
@@ -118,23 +117,23 @@
         android:multiArch="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="${label}"
+        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.GithubMultiApp" >
+        android:theme="@style/Theme.GithubMultiApp">
         <activity
             android:name=".AppListActivity"
             android:exported="true"
-            android:theme="@style/Theme.GithubMultiApp.NoActionBar" >
+            android:theme="@style/Theme.GithubMultiApp.NoActionBar"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <provider
-            android:name="org.waxmoon.MoonProvider"
+            android:name="com.alex.pro.MoonProvider"
             android:authorities="${applicationId}:org.waxmoon.MoonProvider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/org/waxmoon/AppListActivity.kt → app/src/main/java/com/alex/pro/AppListActivity.kt

@@ -1,4 +1,4 @@
-package org.waxmoon
+package com.alex.pro
 
 import android.content.Context
 import android.content.Intent
@@ -24,7 +24,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.tooling.preview.Preview
-import org.waxmoon.ui.theme.GithubMultiAppTheme
+import com.alex.pro.ui.theme.GithubMultiAppTheme
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*

app/src/main/java/org/waxmoon/MoonApplication.java → app/src/main/java/com/alex/pro/MoonApplication.java

@@ -1,4 +1,4 @@
-package org.waxmoon;
+package com.alex.pro;
 
 import android.app.Application;
 import android.content.Context;

app/src/main/java/com/alex/pro/MoonProvider.java

@@ -0,0 +1,8 @@
+package com.alex.pro;
+
+import androidx.core.content.FileProvider;
+
+public class MoonProvider extends FileProvider
+{
+
+}

app/src/main/java/org/waxmoon/ui/theme/Color.kt → app/src/main/java/com/alex/pro/ui/theme/Color.kt

@@ -1,4 +1,4 @@
-package org.waxmoon.ui.theme
+package com.alex.pro.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/java/org/waxmoon/ui/theme/Shape.kt → app/src/main/java/com/alex/pro/ui/theme/Shape.kt

@@ -1,4 +1,4 @@
-package org.waxmoon.ui.theme
+package com.alex.pro.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

app/src/main/java/org/waxmoon/ui/theme/Theme.kt → app/src/main/java/com/alex/pro/ui/theme/Theme.kt

@@ -1,4 +1,4 @@
-package org.waxmoon.ui.theme
+package com.alex.pro.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme

app/src/main/java/org/waxmoon/ui/theme/Type.kt → app/src/main/java/com/alex/pro/ui/theme/Type.kt

@@ -1,4 +1,4 @@
-package org.waxmoon.ui.theme
+package com.alex.pro.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

app/src/main/res/values/strings.xml

@@ -17,4 +17,5 @@
     <string name="toast_unsupport" tools:ignore="MissingTranslation">not support</string>
     <string name="toast_assist_missing" tools:ignore="MissingTranslation">assist not install</string>
     <string name="toast_already_installed" translatable="false">already installed</string>
+    <string name="app_name">haha</string>
 </resources>

app/src/test/java/org/waxmoon/ExampleUnitTest.kt → app/src/test/java/com/alex/pro/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package org.waxmoon
+package com.alex.pro
 
 import org.junit.Test
 

assist/build.gradle

@@ -4,16 +4,22 @@ plugins {
 
 android {
     compileSdk rootProject.ext.compileSdkVersion
-
+    namespace = "org.waxmoon.github"
 
     defaultConfig {
+
         applicationId rootProject.ext.assistPkg
+
         minSdk rootProject.ext.minSdkVersion
+
         targetSdk rootProject.ext.targetSdkVersion
+
         versionCode rootProject.ext.versionCode
+
         versionName rootProject.ext.versionName
 
-        ndk.abiFilters 'armeabi-v7a'
+        //noinspection ChromeOsAbiSupport
+        ndk.abiFilters rootProject.ext.abiFilters
 
         if (!rootProject.ext.isMasterPkg) {
             manifestPlaceholders = [masterPkg: "${rootProject.ext.masterPkg}"]

assist/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.waxmoon"
+
     android:sharedUserId="org.waxmoon.github">
 
     <!--高危权限-->
@@ -117,7 +117,8 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic="true">
         <meta-data android:name="metadata.master.pkg" android:value="${masterPkg}"/>
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />