Upgrade AGP to 8.0.2

An R8 error stops us from upgrading to 8.1.0: https://issuetracker.google.com/issues/277166577 Since we don't use `whenTaskAdded` anywhere, maybe it's caused by one of our dependency Signed-off-by: Songlin Jiang <[email protected]>
Igalia · Nov 5, 2023 · f6bb4e1 · f6bb4e1
1 parent ac0f772
commit f6bb4e1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ on:
         description: 'Gradle version'
         required: false
         type: string
-        default: "7.5"
+        default: "8.0"
 
 jobs:
   build:

diff --git a/app/build.gradle b/app/build.gradle
@@ -674,7 +674,7 @@ dependencies {
     // HVR
     hvrImplementation fileTree(dir: "${project.rootDir}/third_party/hvr", include: ['*.jar'])
     hvrImplementation 'com.huawei.agconnect:agconnect-core-harmony:1.1.0.300'
-    hvrImplementation 'com.huawei.agconnect:agconnect-core:1.6.5.300'
+    hvrImplementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
     hvrImplementation 'com.huawei.hms:hianalytics:6.3.2.300'
     hvrImplementation 'com.huawei.hms:ml-computer-voice-asr:3.1.0.300'
     hvrImplementation 'com.huawei.hms:location:6.2.0.300'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:extractNativeLibs="true"
         android:theme="@style/FxR.Dark">
         <activity
             android:name="com.igalia.wolvic.VRBrowserActivity"

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:$versions.android_gradle_plugin"
         classpath 'com.android.tools:r8:8.2.33'
         classpath "$deps.kotlin.plugin"
-        classpath 'com.huawei.agconnect:agcp:1.6.5.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,7 +27,7 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
     delete "${rootDir}/third_party/wavesdk/build"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -25,3 +25,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 org.gradle.warning.mode=all
+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
@@ -1,6 +1,6 @@
 #Wed Jul 21 16:13:31 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
@@ -45,7 +45,7 @@ versions.atsl_runner = "1.5.2"
 versions.atsl_rules = "1.5.0"
 versions.atsl_junit = "1.1.5"
 versions.espresso = "3.5.1"
-versions.android_gradle_plugin = "7.4.2"
+versions.android_gradle_plugin = "8.0.2"
 versions.kotlin = "1.8.22"
 versions.kotlin_coroutines = "1.7.3"
 versions.snakeyaml = "2.0"