Update Gradle, AGP, and dependencies

DeweyReed · DeweyReed · commit 212a96711a3c · 2026-03-23T13:00:44.000+08:00
diff --git a/app-timer-one/src/main/java/xyz/aprildown/timer/app/timer/one/layout/one/OneLayoutOneFragment.kt b/app-timer-one/src/main/java/xyz/aprildown/timer/app/timer/one/layout/one/OneLayoutOneFragment.kt
@@ -155,7 +155,7 @@ internal class OneLayoutOneFragment :
 
     private fun toggleStep(show: Boolean) {
         val view = requireView()
-        view.findViewById<LinearLayout?>(R.id.layoutOneStepName).isVisible = show
+        view.findViewById<LinearLayout>(R.id.layoutOneStepName).isVisible = show
     }
 
     private fun toggleTimingBar(show: Boolean) {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -172,15 +172,17 @@ dependencies {
     androidTestCompileOnly(libs.taskerPlugin)
 }
 
-android.applicationVariants.configureEach {
-    if (flavorName != "google") {
-        val variantNameCapitalized = name.replaceFirstChar {
+androidComponents.onVariants { variant ->
+    if (variant.flavorName != "google") {
+        val variantNameCapitalized = variant.name.replaceFirstChar {
             if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
         }
         project.tasks.named("process${variantNameCapitalized}GoogleServices").getOrNull()
             ?.enabled = false
         project.tasks.named("injectCrashlyticsMappingFileId${variantNameCapitalized}")
             .getOrNull()?.enabled = false
+        project.tasks.named("injectCrashlyticsVersionControlInfo${variantNameCapitalized}")
+            .getOrNull()?.enabled = false
         try {
             project.tasks.named("uploadCrashlyticsMappingFile${variantNameCapitalized}")
                 .getOrNull()?.enabled = false
diff --git a/app/dependencies/dogReleaseRuntimeClasspath.txt b/app/dependencies/dogReleaseRuntimeClasspath.txt
diff --git a/app/dependencies/googleReleaseRuntimeClasspath.txt b/app/dependencies/googleReleaseRuntimeClasspath.txt
diff --git a/app/dependencies/otherReleaseRuntimeClasspath.txt b/app/dependencies/otherReleaseRuntimeClasspath.txt
diff --git a/baselineProfile/build.gradle.kts b/baselineProfile/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.test)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.androidx.baselineprofile)
 }
 
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -20,7 +20,6 @@ kotlin {
 dependencies {
     compileOnly(plugin(libs.plugins.android.application))
     compileOnly(plugin(libs.plugins.android.library))
-    compileOnly(plugin(libs.plugins.kotlin.android))
     compileOnly(plugin(libs.plugins.kotlin.compose))
     compileOnly(plugin(libs.plugins.kotlin.kapt))
     compileOnly(plugin(libs.plugins.hilt))
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -12,7 +12,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
             val libs = libs
 
             apply(plugin = libs.findPlugin("android-application").get().get().pluginId)
-            apply(plugin = libs.findPlugin("kotlin-android").get().get().pluginId)
             apply(plugin = libs.findPlugin("kotlin-compose").get().get().pluginId)
 
             configureKotlin()
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -11,7 +11,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             val libs = libs
 
             apply(plugin = libs.findPlugin("android-library").get().get().pluginId)
-            apply(plugin = libs.findPlugin("kotlin-android").get().get().pluginId)
 
             configureKotlin()
 
diff --git a/build-logic/convention/src/main/kotlin/Configurations.kt b/build-logic/convention/src/main/kotlin/Configurations.kt
@@ -23,28 +23,29 @@ internal fun Project.configureKotlin() {
             jvmTarget.set(
                 JvmTarget.fromTarget(libs.findVersion("jvmTarget").get().toString())
             )
+            freeCompilerArgs.add("-Xannotation-default-target=param-property")
         }
     }
 }
 
-internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) {
+internal fun Project.configureAndroid(commonExtension: CommonExtension) {
     val libs = libs
     commonExtension.run {
         compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
-        defaultConfig {
+        defaultConfig.run {
             minSdk = libs.findVersion("minSdk").get().toString().toInt()
 
             testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
             vectorDrawables.useSupportLibrary = true
         }
-        compileOptions {
+        compileOptions.run {
             isCoreLibraryDesugaringEnabled = true
             val javaVersion =
                 JavaVersion.toVersion(libs.findVersion("jvmTarget").get().toString())
             sourceCompatibility = javaVersion
             targetCompatibility = javaVersion
         }
-        buildFeatures {
+        buildFeatures.run {
             viewBinding = true
         }
         dependencies {
@@ -53,7 +54,7 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *,
     }
 }
 
-internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *, *, *, *>) {
+internal fun Project.configureCompose(commonExtension: CommonExtension) {
     val libs = libs
     commonExtension.buildFeatures.compose = true
     extensions.getByType<ComposeCompilerGradlePluginExtension>().run {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -7,16 +7,16 @@ plugins {
 
 android {
     namespace = "xyz.aprildown.timer.data"
-
-    sourceSets {
-        getByName("androidTest").assets.srcDir("$projectDir/schemas")
-    }
 }
 
 room {
     schemaDirectory("$projectDir/schemas")
 }
 
+androidComponents.onVariants { variant ->
+    variant.androidTest?.sources?.assets?.addStaticSourceDirectory("$projectDir/schemas")
+}
+
 dependencies {
     implementation(project(":domain"))
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 jvmTarget = "17"
 
-agp = "8.10.1"
+agp = "9.0.1"
 
 compileSdk = "36"
 minSdk = "23"
@@ -11,9 +11,9 @@ targetSdk = "36"
 versionCode = "7070000"
 versionName = "7.7.0"
 
-kotlin = "2.1.21"
-dagger = "2.56.2"
-room = "2.7.2"
+kotlin = "2.3.20"
+dagger = "2.59.2"
+room = "2.8.4"
 
 detekt = "1.23.8"
 
@@ -22,24 +22,24 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
 
-androidx-baselineprofile = "androidx.baselineprofile:1.3.4"
+# TODO: 1.5.0 is required by AGP 9
+androidx-baselineprofile = "androidx.baselineprofile:1.5.0-alpha04"
 
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
-ksp = "com.google.devtools.ksp:2.1.21-2.0.2"
+kotlin-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" }
+ksp = "com.google.devtools.ksp:2.3.6"
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
 room = { id = "androidx.room", version.ref = "room" }
 
-versions = "com.github.ben-manes.versions:0.52.0"
+versions = "com.github.ben-manes.versions:0.53.0"
 dependencyGuard = "com.dropbox.dependency-guard:0.5.0"
 
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 
-gms = "com.google.gms.google-services:4.4.3"
-firebase-crashlytics = "com.google.firebase.crashlytics:3.0.4"
+gms = "com.google.gms.google-services:4.4.4"
+firebase-crashlytics = "com.google.firebase.crashlytics:3.0.6"
 
 convention-android-application = { id = "convention-android-application" }
 convention-android-library = { id = "convention-android-library" }
@@ -56,55 +56,55 @@ kotlin-coroutines-play = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services
 kotlin-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
 
 junit = "junit:junit:4.13.2"
-mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0"
-mockito-core = "org.mockito:mockito-core:5.18.0"
-mockito-android = "org.mockito:mockito-android:5.18.0"
+mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.3.0"
+mockito-core = "org.mockito:mockito-core:5.23.0"
+mockito-android = "org.mockito:mockito-android:5.23.0"
 androidx-test-arch = "androidx.arch.core:core-testing:2.2.0"
 
-androidx-test-core = "androidx.test:core:1.6.1"
-androidx-test-runner = "androidx.test:runner:1.6.2"
-androidx-test-rules = "androidx.test:rules:1.6.1"
-androidx-test-junit = "androidx.test.ext:junit:1.2.1"
-androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.1"
-androidx-test-espresso-contrib = "androidx.test.espresso:espresso-contrib:3.6.1"
-androidx-test-espresso-intents = "androidx.test.espresso:espresso-intents:3.6.1"
+androidx-test-core = "androidx.test:core:1.7.0"
+androidx-test-runner = "androidx.test:runner:1.7.0"
+androidx-test-rules = "androidx.test:rules:1.7.0"
+androidx-test-junit = "androidx.test.ext:junit:1.3.0"
+androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.7.0"
+androidx-test-espresso-contrib = "androidx.test.espresso:espresso-contrib:3.7.0"
+androidx-test-espresso-intents = "androidx.test.espresso:espresso-intents:3.7.0"
 androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
-androidx-test-benchmarkMacroJunit4 = "androidx.benchmark:benchmark-macro-junit4:1.3.4"
+androidx-test-benchmarkMacroJunit4 = "androidx.benchmark:benchmark-macro-junit4:1.4.1"
 
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.1"
-androidx-fragment = "androidx.fragment:fragment:1.8.8"
+androidx-fragment = "androidx.fragment:fragment:1.8.9"
 androidx-recyclerView = "androidx.recyclerview:recyclerview:1.4.0"
 androidx-viewPager2 = "androidx.viewpager2:viewpager2:1.1.0"
 androidx-preference = "androidx.preference:preference:1.2.1"
 androidx-constraintLayout = "androidx.constraintlayout:constraintlayout:2.2.1"
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.9.1"
-androidx-lifecycle-liveData = "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1"
-androidx-lifecycle-viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1"
-androidx-customTabs = "androidx.browser:browser:1.8.0"
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0"
+androidx-lifecycle-liveData = "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
+androidx-lifecycle-viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
+androidx-customTabs = "androidx.browser:browser:1.9.0"
 androidx-dynamicAnimation = "androidx.dynamicanimation:dynamicanimation:1.1.0"
-androidx-media = "androidx.media:media:1.7.0"
-androidx-media3-player = "androidx.media3:media3-exoplayer:1.7.1"
-androidx-core = "androidx.core:core-ktx:1.16.0"
-androidx-collection = "androidx.collection:collection-ktx:1.5.0"
+androidx-media = "androidx.media:media:1.7.1"
+androidx-media3-player = "androidx.media3:media3-exoplayer:1.9.3"
+androidx-core = "androidx.core:core-ktx:1.17.0"
+androidx-collection = "androidx.collection:collection-ktx:1.6.0"
 androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.1"
 androidx-documentFile = "androidx.documentfile:documentfile:1.1.0"
 
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 androidx-room-test = { module = "androidx.room:room-testing", version.ref = "room" }
 
-androidx-navigation-fragment = "androidx.navigation:navigation-fragment-ktx:2.9.1"
-androidx-navigation-ui = "androidx.navigation:navigation-ui-ktx:2.9.1"
+androidx-navigation-fragment = "androidx.navigation:navigation-fragment-ktx:2.9.7"
+androidx-navigation-ui = "androidx.navigation:navigation-ui-ktx:2.9.7"
 
-androidx-work = "androidx.work:work-runtime-ktx:2.10.2"
+androidx-work = "androidx.work:work-runtime-ktx:2.11.1"
 
 androidx-crendential-core = "androidx.credentials:credentials:1.5.0"
 androidx-crendential-play = "androidx.credentials:credentials-play-services-auth:1.5.0"
 
-compose-bom = "androidx.compose:compose-bom:2025.07.00"
+compose-bom = "androidx.compose:compose-bom:2026.03.00"
 compose-material = { module = "androidx.compose.material3:material3" }
 compose-icons = { module = "androidx.compose.material:material-icons-extended" }
-compose-activity = "androidx.activity:activity-compose:1.10.1"
+compose-activity = "androidx.activity:activity-compose:1.13.0"
 compose-liveData = { module = "androidx.compose.runtime:runtime-livedata" }
 compose-constraintLayout = "androidx.constraintlayout:constraintlayout-compose:1.1.1"
 materialColorUtilities = "com.materialkolor:material-color-utilities:1.5.1"
@@ -117,23 +117,23 @@ timber = "com.jakewharton.timber:timber:5.0.1"
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
 hilt-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "dagger" }
-hilt-navigation = "androidx.hilt:hilt-navigation-fragment:1.2.0"
-hilt-work = "androidx.hilt:hilt-work:1.2.0"
-hilt-work-compiler = "androidx.hilt:hilt-compiler:1.2.0"
+hilt-navigation = "androidx.hilt:hilt-navigation-fragment:1.3.0"
+hilt-work = "androidx.hilt:hilt-work:1.3.0"
+hilt-work-compiler = "androidx.hilt:hilt-compiler:1.3.0"
 
 moshi-core = "com.squareup.moshi:moshi:1.15.2"
 moshi-kotlinGen = "com.squareup.moshi:moshi-kotlin-codegen:1.15.2"
 
 billing = "com.android.billingclient:billing-ktx:7.1.1"
-firebase-bom = "com.google.firebase:firebase-bom:34.0.0"
+firebase-bom = "com.google.firebase:firebase-bom:34.11.0"
 firebase-auth = { module = "com.google.firebase:firebase-auth" }
 firebase-storage = { module = "com.google.firebase:firebase-storage" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
-playServices-googleId = "com.google.android.libraries.identity.googleid:googleid:1.1.1"
+playServices-googleId = "com.google.android.libraries.identity.googleid:googleid:1.2.0"
 playServices-review = "com.google.android.play:review-ktx:2.0.2"
 
 androidJob = "com.github.DeweyReed:android-job:a04c817792"
-okio = "com.squareup.okio:okio:3.15.0"
+okio = "com.squareup.okio:okio:3.17.0"
 permission = "pub.devrel:easypermissions:3.0.0"
 
 fastAdapter-core = "com.mikepenz:fastadapter:5.7.0"
@@ -156,11 +156,11 @@ scrollHmsPicker = "com.github.DeweyReed:ScrollHmsPicker:2.1.0"
 theme = "com.github.DeweyReed:Theme:0.4.0"
 toggleButtonGroup = "com.nex3z:toggle-button-group:1.2.3"
 ultimateRingtonePicker = "com.github.DeweyReed:UltimateRingtonePicker:3.3.0"
-zip4j = "net.lingala.zip4j:zip4j:2.11.5"
+zip4j = "net.lingala.zip4j:zip4j:2.11.6"
 taskerPlugin = "com.joaomgcd:taskerpluginlibrary:0.4.10"
-diskLruCache = "com.github.bumptech.glide:disklrucache:4.16.0"
-coil = "io.coil-kt.coil3:coil-compose:3.2.0"
-coil-gif = "io.coil-kt.coil3:coil-gif:3.2.0"
+diskLruCache = "com.github.bumptech.glide:disklrucache:5.0.5"
+coil = "io.coil-kt.coil3:coil-compose:3.4.0"
+coil-gif = "io.coil-kt.coil3:coil-gif:3.4.0"
 zoomable = "net.engawapg.lib:zoomable:1.6.1"
 twoWayNestedScrollView = "com.github.ultimate-deej:twowaynestedscrollview:0.1.2"
 accurateCountDownTimer = "com.github.cardinalby:accurate-count-down-timer:1.0"
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.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ internal class OneLayoutOneFragment :`
`155`	`155`
`156`	`156`	`private fun toggleStep(show: Boolean) {`
`157`	`157`	`val view = requireView()`
`158`		`- view.findViewById<LinearLayout?>(R.id.layoutOneStepName).isVisible = show`
	`158`	`+ view.findViewById<LinearLayout>(R.id.layoutOneStepName).isVisible = show`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`private fun toggleTimingBar(show: Boolean) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.android.test)`
`3`		`- alias(libs.plugins.kotlin.android)`
`4`	`3`	`alias(libs.plugins.androidx.baselineprofile)`
`5`	`4`	`}`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -23,28 +23,29 @@ internal fun Project.configureKotlin() {`
`23`	`23`	`jvmTarget.set(`
`24`	`24`	`JvmTarget.fromTarget(libs.findVersion("jvmTarget").get().toString())`
`25`	`25`	`)`
	`26`	`+ freeCompilerArgs.add("-Xannotation-default-target=param-property")`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`30`		`-internal fun Project.configureAndroid(commonExtension: CommonExtension<, , , , , >) {`
	`31`	`+internal fun Project.configureAndroid(commonExtension: CommonExtension) {`
`31`	`32`	`val libs = libs`
`32`	`33`	`commonExtension.run {`
`33`	`34`	`compileSdk = libs.findVersion("compileSdk").get().toString().toInt()`
`34`		`- defaultConfig {`
	`35`	`+ defaultConfig.run {`
`35`	`36`	`minSdk = libs.findVersion("minSdk").get().toString().toInt()`
`36`	`37`
`37`	`38`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`38`	`39`	`vectorDrawables.useSupportLibrary = true`
`39`	`40`	`}`
`40`		`- compileOptions {`
	`41`	`+ compileOptions.run {`
`41`	`42`	`isCoreLibraryDesugaringEnabled = true`
`42`	`43`	`val javaVersion =`
`43`	`44`	`JavaVersion.toVersion(libs.findVersion("jvmTarget").get().toString())`
`44`	`45`	`sourceCompatibility = javaVersion`
`45`	`46`	`targetCompatibility = javaVersion`
`46`	`47`	`}`
`47`		`- buildFeatures {`
	`48`	`+ buildFeatures.run {`
`48`	`49`	`viewBinding = true`
`49`	`50`	`}`
`50`	`51`	`dependencies {`
`@@ -53,7 +54,7 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension<, , *,`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`
`56`		`-internal fun Project.configureCompose(commonExtension: CommonExtension<, , , , , >) {`
	`57`	`+internal fun Project.configureCompose(commonExtension: CommonExtension) {`
`57`	`58`	`val libs = libs`
`58`	`59`	`commonExtension.buildFeatures.compose = true`
`59`	`60`	`extensions.getByType<ComposeCompilerGradlePluginExtension>().run {`