update agt to 8.0.0

wildfirechat · Apr 15, 2023 · 04952da · 04952da
1 parent 7edef02
commit 04952da
Show file tree

Hide file tree

Showing 18 changed files with 242 additions and 178 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,13 +10,13 @@ buildscript {
         maven {url 'https://developer.huawei.com/repo/'}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.huawei.agconnect:agcp:1.2.1.301'
+        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.huawei.agconnect:agcp:1.5.2.300'
        // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.gms:google-services:4.3.15'
     }
 }
 

diff --git a/chat/build.gradle b/chat/build.gradle
@@ -12,8 +12,6 @@ android {
         }
     }
     compileSdkVersion 31
-    aaptOptions.cruncherEnabled = false
-    aaptOptions.useNewCruncher = false
     ndkVersion '18.1.5063045'
     defaultConfig {
         applicationId "cn.wildfirechat.chat"
@@ -24,7 +22,7 @@ android {
         multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
-                includeCompileClasspath true
+//                includeCompileClasspath true
             }
         }
 
@@ -47,11 +45,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    lintOptions {
-        abortOnError false
-    }
     productFlavors {
     }
+    namespace 'cn.wildfirechat.chat'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/chat/src/main/AndroidManifest.xml b/chat/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="cn.wildfirechat.chat">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/client/build.gradle b/client/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
 
         // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
@@ -39,13 +37,17 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
     compileOptions {
         targetCompatibility 1.8
         sourceCompatibility 1.8
     }
+    namespace 'cn.wildfirechat.client'
+    lint {
+        abortOnError false
+    }
+    buildFeatures {
+        aidl true
+    }
 }
 
 

diff --git a/client/src/main/AndroidManifest.xml b/client/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.wildfirechat.client">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

diff --git a/emojilibrary/build.gradle b/emojilibrary/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -25,6 +23,7 @@ android {
             abortOnError false
         }
     }
+    namespace 'com.lqr.emoji'
 
 }
 

diff --git a/emojilibrary/src/main/AndroidManifest.xml b/emojilibrary/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.lqr.emoji">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
                  android:label="@string/app_name"

diff --git a/gradle.properties b/gradle.properties
@@ -22,4 +22,7 @@ android.enableJetifier=true
 android.debug.obsoleteApi=true
 android.enableDexingArtifactTransform.desugaring=false
 android.injected.testOnly=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat May 30 17:17:24 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip