From 531d4b1bcdb5f55377eed766d8c16ebf21c5d980 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2026 19:24:04 +0000
Subject: [PATCH 1/3] build(deps): bump com.android.library in
 /packages/kotlin/src

Bumps com.android.library from 8.12.3 to 9.3.1.

---
updated-dependencies:
- dependency-name: com.android.library
  dependency-version: 9.3.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kotlin/src/gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kotlin/src/gradle/libs.versions.toml b/packages/kotlin/src/gradle/libs.versions.toml
index eff2602e5..7829cc7b1 100644
--- a/packages/kotlin/src/gradle/libs.versions.toml
+++ b/packages/kotlin/src/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.3"
+agp = "9.3.1"
 kotlin = "2.4.10"
 
 kotlinx-coroutines = "1.11.0"

From aa8184e000caef261f9c990fc8af36effd0234e8 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 1 Aug 2026 21:24:54 +0200
Subject: [PATCH 2/3] fix: bump Gradle to 9.5.0 and align SDK level for AGP
 9.3.1

---
 packages/kotlin/src/android/build.gradle.kts               | 7 ++++---
 .../kotlin/src/gradle/wrapper/gradle-wrapper.properties    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/kotlin/src/android/build.gradle.kts b/packages/kotlin/src/android/build.gradle.kts
index 174095eda..749b3d38e 100644
--- a/packages/kotlin/src/android/build.gradle.kts
+++ b/packages/kotlin/src/android/build.gradle.kts
@@ -4,8 +4,9 @@ import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
+    // AGP 9+ has built-in Kotlin support; a separate kotlin-android plugin is no
+    // longer applied. See https://issuetracker.google.com/438678642.
     alias(libs.plugins.android.library)
-    alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.dokka)
     alias(libs.plugins.mavenPublish)
     `maven-publish`
@@ -83,13 +84,13 @@ kotlin {
 
 android {
     namespace = project.group.toString()
-    compileSdk = 34
+    compileSdk = 37
 
     defaultConfig {
         minSdk = 26
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         aarMetadata {
-            minCompileSdk = 34
+            minCompileSdk = 37
         }
     }
 
diff --git a/packages/kotlin/src/gradle/wrapper/gradle-wrapper.properties b/packages/kotlin/src/gradle/wrapper/gradle-wrapper.properties
index 2a84e188b..1a704683a 100644
--- a/packages/kotlin/src/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/kotlin/src/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 14f2caa4e2912392d51618296d3fdd1de895f82d Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 1 Aug 2026 21:37:56 +0200
Subject: [PATCH 3/3] fix: opt-in AGP 9 release host unit-test task

---
 packages/kotlin/src/android/build.gradle.kts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/kotlin/src/android/build.gradle.kts b/packages/kotlin/src/android/build.gradle.kts
index 749b3d38e..6508a4e43 100644
--- a/packages/kotlin/src/android/build.gradle.kts
+++ b/packages/kotlin/src/android/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.android.build.api.variant.HostTestBuilder
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
@@ -82,6 +83,15 @@ kotlin {
     }
 }
 
+// AGP 9 only generates unit-test tasks for the debug variant by default. Our
+// pipeline runs tests against the release variant (matches published artifact),
+// so enable the release host unit-test explicitly.
+androidComponents {
+    beforeVariants(selector().withBuildType("release")) { variantBuilder ->
+        variantBuilder.hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true
+    }
+}
+
 android {
     namespace = project.group.toString()
     compileSdk = 37