diff --git a/android_crop_lib/build.gradle b/android_crop_lib/build.gradle index 201728462..bb2141d15 100644 --- a/android_crop_lib/build.gradle +++ b/android_crop_lib/build.gradle @@ -29,6 +29,7 @@ android { kotlinOptions { jvmTarget = "11" } + namespace 'com.soundcloud.android.crop' } dependencies { diff --git a/android_crop_lib/src/main/AndroidManifest.xml b/android_crop_lib/src/main/AndroidManifest.xml index 0cb62bb6e..cc947c567 100644 --- a/android_crop_lib/src/main/AndroidManifest.xml +++ b/android_crop_lib/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 7c846496c..46ecee1d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -170,6 +170,7 @@ android { } buildToolsVersion = '30.0.3' + namespace 'com.nnbc123.app' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d978857fe..75278bd66 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/build.gradle b/build.gradle index e3bbc0636..70384dbc9 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:8.1.1' //realm 数据库插件 classpath "io.realm:realm-gradle-plugin:5.3.0" // android 资源混淆插件 diff --git a/core/build.gradle b/core/build.gradle index 1ee93dbe6..429bc49f8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -53,6 +53,7 @@ android { } buildToolsVersion = '30.0.3' + namespace 'com.nnbc123.core' } diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 73482d106..0a0938ae3 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,4 +1,3 @@ - + diff --git a/gradle.properties b/gradle.properties index 8dc3093e9..870b273d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,11 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m +org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m \ +--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ +--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ +--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + org.gradle.daemon=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit @@ -30,4 +34,7 @@ MIN_SDK_VERSION=21 TARGET_SDK_VERSION=32 version_name=1.3.2 -version_code=132 \ No newline at end of file +version_code=132 +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ce82f0055..b387921c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Apr 03 18:35:35 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index 9267b4ba5..ac9283dad 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -57,6 +57,7 @@ android { } } buildToolsVersion = '30.0.3' + namespace 'com.nnbc123.library' } dependencies { diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 37b22eca7..3b284b79d 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/nim_uikit/AndroidManifest.xml b/nim_uikit/AndroidManifest.xml index c2f131944..15b56bf18 100644 --- a/nim_uikit/AndroidManifest.xml +++ b/nim_uikit/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle index ef8e0ac00..b8a63869e 100644 --- a/nim_uikit/build.gradle +++ b/nim_uikit/build.gradle @@ -40,6 +40,12 @@ android { kotlinOptions { jvmTarget = "11" } + buildFeatures { + renderScript true + aidl true + } + + namespace 'com.netease.nim.uikit' } def overscroll_android = "1.0.4"