diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml index 3ab0d92a0..afaaabefc 100644 --- a/.github/workflows/android-test.yml +++ b/.github/workflows/android-test.yml @@ -18,7 +18,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v1 with: - java-version: 15 + java-version: 17 - name: set up kotlin uses: fwilhe2/setup-kotlin@main with: diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 53b07c665..ddae6566a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,10 +14,10 @@ jobs: - name: checkout id: check uses: actions/checkout@v1 - - name: set up JDK 15 + - name: set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 15 + java-version: 17 - name: Build inrt template run: | chmod 777 ./gradlew diff --git a/README.md b/README.md index 3379e11a2..d31f16ae0 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,9 @@ * autojs 能不能商用,取决于你对于附带的 “ **非商业性使用** ” 的理解和其法律效益。 * 反正本产品不会拿autojs 进行商用。 -#### 编译相关: +### 编译相关: +环境要求:`jdk`版本17以上 + 命令说明:在项目根目录下运行命令,如果使用 Windows powerShell < 7.0,请使用包含 ";" 的命令 ##### 本地安装调试版本到设备: diff --git a/apkbuilder/build.gradle.kts b/apkbuilder/build.gradle.kts index c1f2cc66b..8fa88bb87 100644 --- a/apkbuilder/build.gradle.kts +++ b/apkbuilder/build.gradle.kts @@ -23,6 +23,7 @@ android { ) } } + namespace = "com.stardust.autojs.apkbuilder" } diff --git a/apkbuilder/src/main/AndroidManifest.xml b/apkbuilder/src/main/AndroidManifest.xml index ee43fc393..652866d61 100755 --- a/apkbuilder/src/main/AndroidManifest.xml +++ b/apkbuilder/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + xmlns:tools="http://schemas.android.com/tools"> diff --git a/autojs/build.gradle.kts b/autojs/build.gradle.kts index 318857d19..b55f737dc 100644 --- a/autojs/build.gradle.kts +++ b/autojs/build.gradle.kts @@ -33,6 +33,7 @@ android { res.srcDirs("src/main/res","src/main/res-i18n") } } + namespace = "com.stardust.autojs" } dependencies { diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml index 962ee2bb6..2475da504 100644 --- a/autojs/src/main/AndroidManifest.xml +++ b/autojs/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/automator/build.gradle.kts b/automator/build.gradle.kts index 213cb4e55..944c05d33 100644 --- a/automator/build.gradle.kts +++ b/automator/build.gradle.kts @@ -29,6 +29,7 @@ android { jniLibs.srcDirs("/libs") } } + namespace = "com.stardust.automator" } dependencies { diff --git a/automator/src/main/AndroidManifest.xml b/automator/src/main/AndroidManifest.xml index aa820cf5d..798c5536d 100644 --- a/automator/src/main/AndroidManifest.xml +++ b/automator/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + > diff --git a/build.gradle.kts b/build.gradle.kts index 962676488..ee2bebaf7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.copyFreeCompilerArgsToArgs - initVersions(file("project-versions.json")) // Top-level build file where you can add configuration options common to all sub-projects/modules. @@ -24,7 +22,7 @@ buildscript { // maven { url = uri("https://jitpack.io") } } dependencies { - classpath("com.android.tools.build:gradle:7.2.1") + classpath("com.android.tools.build:gradle:8.0.2") classpath(kotlin("gradle-plugin", version = "$kotlin_version")) classpath("com.jakewharton:butterknife-gradle-plugin:10.2.3") classpath("org.codehaus.groovy:groovy-json:3.0.8") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index e1b98818b..be68e6d6b 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -35,6 +35,7 @@ android { res.srcDirs("src/main/res","src/main/res-i18n") } } + namespace = "com.stardust" } dependencies { diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index ffebfcf45..750e01f7a 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + > + xmlns:tools="http://schemas.android.com/tools"> diff --git a/paddleocr/build.gradle.kts b/paddleocr/build.gradle.kts index 4a3f4f9b3..1d0163ddf 100644 --- a/paddleocr/build.gradle.kts +++ b/paddleocr/build.gradle.kts @@ -24,6 +24,7 @@ android { jniLibs.srcDirs("src/main/jniLibs") } } + namespace = "org.autojs.autoxjs.paddleocr" } dependencies { diff --git a/paddleocr/src/main/AndroidManifest.xml b/paddleocr/src/main/AndroidManifest.xml index 1c67846e6..a5918e68a 100644 --- a/paddleocr/src/main/AndroidManifest.xml +++ b/paddleocr/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file