Update AGP to 9.0.0

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           cache: gradle
 
       - name: Set up Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
           cache-dependency-path: stbridge/go.sum
           go-version-file: stbridge/go.mod

app/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
+ * SPDX-FileCopyrightText: 2023-2026 Andrew Gunnerson
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
@@ -18,7 +18,6 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
 }
 
 java {
@@ -121,7 +120,7 @@ android {
 
     compileSdk = 36
     buildToolsVersion = "36.0.0"
-    ndkVersion = "28.2.13676358"
+    ndkVersion = "29.0.14206865"
 
     defaultConfig {
         applicationId = "com.chiller3.basicsync"
@@ -137,18 +136,8 @@ android {
         buildConfigField("String", "PROJECT_URL_AT_COMMIT",
             "\"${projectUrl}/tree/${gitVersionTriple.third.name}\"")
 
-        buildConfigField("String", "DOCUMENTS_AUTHORITY",
-            "APPLICATION_ID + \".documents\"")
-
         resValue("string", "app_name", "@string/app_name_release")
     }
-    sourceSets {
-        getByName("main") {
-            assets {
-                srcDir(archiveDir)
-            }
-        }
-    }
     signingConfigs {
         create("release") {
             val keystore = System.getenv("RELEASE_KEYSTORE")
@@ -173,16 +162,13 @@ android {
             signingConfig = signingConfigs.getByName("release")
         }
     }
-    applicationVariants.all {
-        // This is set here so that applicationIdSuffix will be respected
-        resValue("string", "documents_authority", "$applicationId.documents")
-    }
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_21)
         targetCompatibility(JavaVersion.VERSION_21)
     }
     buildFeatures {
         buildConfig = true
+        resValues = true
         viewBinding = true
     }
     splits {
@@ -200,6 +186,14 @@ android {
     }
 }
 
+androidComponents.onVariants { variant ->
+    variant.sources.assets!!.addGeneratedSourceDirectory(archive) {
+        project.objects.directoryProperty().apply {
+            set(archiveDir)
+        }
+    }
+}
+
 kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_21
@@ -573,11 +567,9 @@ tasks.register("iconPng") {
     }
 }
 
-android.applicationVariants.all {
-    preBuildProvider.configure {
-        dependsOn(archive)
-        dependsOn(stbridge)
-    }
+androidComponents.onVariants { variant ->
+    variant.lifecycleTasks.registerPreBuild(archive)
+    variant.lifecycleTasks.registerPreBuild(stbridge)
 }
 
 data class LinkRef(val type: String, val number: Int) : Comparable<LinkRef> {

build.gradle.kts

@@ -6,5 +6,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
 }

gradle.properties

@@ -11,9 +11,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

gradle/libs.versions.toml

@@ -1,12 +1,11 @@
 [versions]
 activity-ktx = "1.12.2"
-android-gradle-plugin = "8.13.2"
+android-gradle-plugin = "9.0.0"
 appcompat = "1.7.1"
 camera = "1.5.2"
 core-ktx = "1.17.0"
 jgit = "7.5.0.202512021534-r"
 fragment-ktx = "1.8.9"
-kotlin = "2.3.0"
 material = "1.13.0"
 preference-ktx = "1.2.1"
 zxing = "3.5.4"
@@ -28,4 +27,3 @@ zxing-core = { group = "com.google.zxing", name = "core", version.ref = "zxing"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionSha256Sum=0d585f69da091fc5b2beced877feab55a3064d43b8a1d46aeb07996b0915e0e0
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME