Skip to content

Commit 1292de1

Browse files
committed
build: upgrade AGP to 9.0.0 and Gradle to 9.2.1
Upgrades the Android Gradle Plugin to 9.0.0, the Gradle Wrapper to 9.2.1, and the Compose Screenshot plugin to 0.0.1-alpha13. This resolves configuration issues with the `GenerateTestConfig` task where `mergedManifest` was not properly configured. Also adds necessary AGP 9.0 compatibility flags to gradle.properties.
1 parent d343b98 commit 1292de1

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,13 @@ android.nonTransitiveRClass=false
3434
android.nonFinalResIds=false
3535

3636
android.experimental.enableScreenshotTest=true
37+
android.defaults.buildfeatures.resvalues=true
38+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
39+
android.enableAppCompileTimeRClass=false
40+
android.usesSdkInManifest.disallowed=false
41+
android.uniquePackageNames=false
42+
android.dependency.useConstraints=true
43+
android.r8.strictFullModeForKeepRules=false
44+
android.r8.optimizedResourceShrinking=false
45+
android.builtInKotlin=false
46+
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# This file is organized into functional groups: Base, Android, Material, Google Maps Platform (GMP), and Testing.
22
# Please maintain this structure when adding new dependencies or versions.
3+
34
[versions]
45
# Base
5-
agp = "8.13.2" # Do not upgrade to 9.0.0 yet
6+
androidCompileSdk = "36"
7+
androidMinSdk = "23"
8+
androidTargetSdk = "36"
9+
10+
agp = "9.0.0"
611
dokka = "2.1.0"
712
gradleMavenPublishPlugin = "0.36.0"
813
jacoco-plugin = "0.2.1"
@@ -11,9 +16,6 @@ kotlinxCoroutines = "1.10.2"
1116

1217
# Android
1318
activitycompose = "1.12.2"
14-
androidCompileSdk = "36"
15-
androidMinSdk = "23"
16-
androidTargetSdk = "36"
1719
androidx-core = "1.17.0"
1820
androidx-startup = "1.2.0"
1921
compose-bom = "2026.01.00"
@@ -39,7 +41,7 @@ mockk = "1.14.9"
3941
mockkAndroid = "1.14.9"
4042
org-jacoco-core = "0.8.14"
4143
robolectric = "4.16.1"
42-
screenshot = "0.0.1-alpha12" # Do not upgrade to alpha13 (broken)
44+
screenshot = "0.0.1-alpha13"
4345
truth = "1.4.5"
4446

4547
[libraries]
@@ -96,4 +98,4 @@ android-application = { id = "com.android.application", version.ref = "agp" }
9698
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
9799
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
98100
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
99-
screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}
101+
screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)