From ad3a9a6c2e611b842dbb897d542140a15d0a00d8 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 6 Feb 2026 14:55:11 -0600 Subject: [PATCH] Update AGP to v9.0.0 (#6479) --- annotation/build.gradle.kts | 1 - annotation/consumer-rules.pro | 0 annotation/proguard-rules.pro | 21 +++++++++++++++++++++ app/build.gradle.kts | 1 - authenticator/build.gradle.kts | 1 - authenticatorbridge/build.gradle.kts | 1 - build.gradle.kts | 1 - core/build.gradle.kts | 1 - cxf/build.gradle.kts | 1 - data/build.gradle.kts | 1 - gradle.properties | 4 ++-- gradle/libs.versions.toml | 5 ++--- network/build.gradle.kts | 1 - testharness/build.gradle.kts | 1 - ui/build.gradle.kts | 1 - 15 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 annotation/consumer-rules.pro create mode 100644 annotation/proguard-rules.pro diff --git a/annotation/build.gradle.kts b/annotation/build.gradle.kts index 6e59c102ab..2c7e490d28 100644 --- a/annotation/build.gradle.kts +++ b/annotation/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/annotation/consumer-rules.pro b/annotation/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/annotation/proguard-rules.pro b/annotation/proguard-rules.pro new file mode 100644 index 0000000000..f1b424510d --- /dev/null +++ b/annotation/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2766aa3d1c..92ca82acaa 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,6 @@ plugins { // standardDebug builds in the merged manifest. alias(libs.plugins.crashlytics) alias(libs.plugins.hilt) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose.compiler) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index 08a1fec40a..62381e0a97 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -10,7 +10,6 @@ plugins { alias(libs.plugins.androidx.room) alias(libs.plugins.crashlytics) alias(libs.plugins.hilt) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose.compiler) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts index e99f8527fb..9146020b1b 100644 --- a/authenticatorbridge/build.gradle.kts +++ b/authenticatorbridge/build.gradle.kts @@ -5,7 +5,6 @@ val version = "1.0.2" plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) } diff --git a/build.gradle.kts b/build.gradle.kts index 46a810847b..ae56c4ee1b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,6 @@ plugins { alias(libs.plugins.androidx.room) apply false alias(libs.plugins.detekt) apply true alias(libs.plugins.hilt) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose.compiler) apply false alias(libs.plugins.kotlin.parcelize) apply false alias(libs.plugins.kotlinx.kover) apply true diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ba604ec8ba..bcb821c88e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) alias(libs.plugins.hilt) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) } diff --git a/cxf/build.gradle.kts b/cxf/build.gradle.kts index 2f26a90a9c..227f997451 100644 --- a/cxf/build.gradle.kts +++ b/cxf/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) alias(libs.plugins.google.services) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 4cff087a22..deaaa2b09a 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) alias(libs.plugins.hilt) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) } diff --git a/gradle.properties b/gradle.properties index 30c32423ad..c3415fc913 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ android.experimental.enableTestFixturesKotlinSupport=true -android.useAndroidX=true +android.dependency.useConstraints=true +android.newDsl=false kotlin.code.style=official kotlin.compilerArgs=-Xjspecify-annotations=strict, -Xtype-enhancement-improvements-strict-mode @@ -10,6 +11,5 @@ org.gradle.parallel=true # Disable build features that are enabled by default and we do not need # developer.android.com/reference/tools/gradle-api/7.4/com/android/build/api/dsl/BuildFeatures -android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 656379ca60..9b83f0726b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ minSdk = "29" minSdkBwa = "28" # Dependency Versions -androidGradlePlugin = "8.13.2" +androidGradlePlugin = "9.0.0" androidxActivity = "1.12.3" androidxAppCompat = "1.7.1" androdixAutofill = "1.3.0" @@ -41,7 +41,7 @@ googleProtoBufJava = "4.33.5" googleProtoBufPlugin = "0.9.6" googleServices = "4.4.4" googleReview = "2.0.2" -hilt = "2.58" +hilt = "2.59.1" junit = "6.0.2" jvmTarget = "21" kotlin = "2.3.0" @@ -147,7 +147,6 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-protobuf = { id = "com.google.protobuf", version.ref = "googleProtoBufPlugin" } google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/network/build.gradle.kts b/network/build.gradle.kts index fcccb0feba..37a59af238 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) } diff --git a/testharness/build.gradle.kts b/testharness/build.gradle.kts index c569e20738..ba806a7374 100644 --- a/testharness/build.gradle.kts +++ b/testharness/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) alias(libs.plugins.hilt) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose.compiler) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 9c129f07ed..b4b6f3978c 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose.compiler) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.ksp)