Merge pull request #419 from openziti/agp-v9

update AGP v9

Author: ekoby

app/build.gradle.kts

@@ -3,11 +3,9 @@
  * Copyright (c) 2025 NetFoundry. All rights reserved.
  */
 import org.jetbrains.kotlin.konan.properties.Properties
-import java.io.ByteArrayOutputStream
 
 plugins {
     alias(libs.plugins.android.app)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
 
@@ -108,7 +106,9 @@ android {
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
             signingConfig = signingConfigs.getByName("release")
         }
     }

app/src/main/java/org/openziti/mobile/ZitiEnrollmentActivity.kt

@@ -231,7 +231,7 @@ fun EnrollmentCard(imageId: Int, textId: Int, onClick: () -> Unit) {
     Card(
         modifier = Modifier.padding(4.dp),
         colors = CardDefaults.cardColors(
-            containerColor = colorResource(R.color.cardview_light_background)
+            containerColor = colorResource(androidx.cardview.R.color.cardview_light_background)
         ),
         border = BorderStroke(1.dp, Color.Black),
         onClick = onClick

gradle.properties

@@ -17,10 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
 
 # org.gradle.parallel=true
 
-android.useAndroidX=true
-android.enableJetifier=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
-
 # CI cmake version
-cmake.version=3.30.1
+cmake.version=3.30.1

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # plugins
-android = "8.13.2"
+android = "9.0.0"
 kotlin = "2.3.0"
 ndk = "28.2.13676358"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

tunnel/build.gradle.kts

@@ -7,7 +7,6 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn
 
 plugins {
     alias(libs.plugins.android.lib)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
 }
 
@@ -115,7 +114,7 @@ val buildNative = tasks.register("build-native-dependencies") {}
 tasks.named("preBuild").dependsOn(buildNative)
 
 if (!hasProperty("skipDependentBuild")) {
-    val ndkRoot = android.ndkDirectory.absolutePath
+    val ndkRoot = androidComponents.sdkComponents.ndkDirectory.get()
     println("using NDK: $ndkRoot")
     presets.forEach { triplet ->
         val task = tasks.register<Exec>("build-native-deps-${triplet}") {