更新构建工具

kkevsekk1 · Aug 15, 2023 · 4d3c9c6 · 4d3c9c6
1 parent e6ecf16
commit 4d3c9c6
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 19 deletions.
diff --git 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
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.stardust.autojs.apkbuilder">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,4 @@
-import java.util.*
-import java.io.File
+import java.util.Properties
 
 plugins {
     id("com.android.application")
@@ -166,6 +165,7 @@ android {
             )
         )
     }
+    namespace = "org.autojs.autoxjs"
 
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/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"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.autojs.autoxjs">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git 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
@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.stardust.autojs">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git 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
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-    package="com.stardust.automator">
+    >
 
     <application android:supportsRtl="true">
 

diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-    package="com.stardust">
+    >
 
     <application
         android:allowBackup="true"

diff --git a/gradle.properties b/gradle.properties
@@ -26,4 +26,7 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.useDeprecatedNdk=true
+android.useDeprecatedNdk=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
diff --git a/inrt/build.gradle.kts b/inrt/build.gradle.kts
@@ -127,6 +127,7 @@ android {
         )
 
     }
+    namespace = "org.autojs.autoxjs.inrt"
 
 
 }

diff --git a/inrt/src/main/AndroidManifest.xml b/inrt/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"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.autojs.autoxjs.inrt">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name= "android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git 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
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.autojs.autoxjs.paddleocr">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>