chore(agp): migrate AGP 8 and gradle 8.1

mcatta · Oct 14, 2023 · 6c66124 · 6c66124
1 parent 3bb2823
commit 6c66124
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,6 +38,10 @@ android {
         versionName = "1.2.2"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
             signingConfig = signingConfigs.getByName("release")

diff --git a/...tools/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidAppConvention.kt b/...tools/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidAppConvention.kt
@@ -44,7 +44,7 @@ internal class AndroidAppConvention : BuildConvention {
 
             ext.compileSdk = AndroidConfigs.COMPILE_SDK
 
-            ext.packagingOptions {
+            ext.packaging {
                 resources {
                     excludes += "/META-INF/{AL2.0,LGPL2.1}"
                 }

diff --git a/...s/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidComposeConvention.kt b/...s/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidComposeConvention.kt
@@ -24,7 +24,7 @@ import sleep.buildtools.utils.libsCatalog
 
 internal class AndroidComposeConvention : BuildConvention {
     override fun apply(target: Project) {
-        target.extensions.configure<CommonExtension<*, *, *, *>> { ext ->
+        target.extensions.configure<CommonExtension<*, *, *, *, *>> { ext ->
             ext.buildFeatures {
                 compose = true
             }

diff --git a/build-tools/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidConvention.kt b/build-tools/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidConvention.kt
@@ -38,7 +38,7 @@ internal class AndroidConvention : BuildConvention {
             }
         }
 
-        target.extensions.configure<CommonExtension<*, *, *, *>> { ext ->
+        target.extensions.configure<CommonExtension<*, *, *, *, *>> { ext ->
             ext.compileSdk = AndroidConfigs.COMPILE_SDK
 
             ext.defaultConfig {

diff --git a/...s/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidLibraryConvention.kt b/...s/android/src/main/kotlin/sleep/buildtools/android/convention/AndroidLibraryConvention.kt
@@ -38,7 +38,6 @@ internal class AndroidLibraryConvention : BuildConvention {
             }
 
             ext.defaultConfig {
-                targetSdk = AndroidConfigs.TARGET_SDK
                 minSdk = AndroidConfigs.MIN_SDK
                 testInstrumentationRunner = AndroidConfigs.TEST_INSTRUMENTATION_RUNNER
                 vectorDrawables.useSupportLibrary = true

diff --git a/data/build.gradle b/data/build.gradle
@@ -23,6 +23,10 @@ plugins {
 android {
     namespace 'dev.marcocattaneo.sleep.data'
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     defaultConfig {
         buildConfigField("String", "BASE_URL", "\"https://europe-west2-sleep-app-mobile.cloudfunctions.net/\"")
     }

diff --git a/gradle.properties b/gradle.properties
@@ -41,4 +41,5 @@ org.gradle.daemon=true
 org.gradle.caching=true
 # Config
 sleep.jvm.version=11
-sleep.jvm.warning-as-error=false
+sleep.jvm.warning-as-error=false
+android.nonTransitiveRClass=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ coroutine = "1.6.4"
 detekt = "1.21.0"
 mockk = "1.12.5"
 accompanist = "0.25.1"
-androidGradlePlugin = "7.4.2"
+androidGradlePlugin = "8.1.2"
 jacoco = "0.8.8"
 
 [libraries]

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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in