From 5ad41b49bced1d5c206332c7c34e4d6c3165394b Mon Sep 17 00:00:00 2001
From: Jaebaek Seo <jaebaek@google.com>
Date: Mon, 2 Feb 2026 23:18:50 +0000
Subject: [PATCH] Migrate Jetchat to AGP 9.0

GiAS prepared this by relying on AKB tools.
---
 Jetchat/app/build.gradle.kts                     |  3 +--
 Jetchat/build.gradle.kts                         |  1 -
 Jetchat/gradle/libs.versions.toml                | 10 ++++------
 Jetchat/gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts
index 1a37c1026..a13f4cc6c 100644
--- a/Jetchat/app/build.gradle.kts
+++ b/Jetchat/app/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose)
 }
 
@@ -67,7 +66,7 @@ android {
 
     kotlin {
         compilerOptions {
-            jvmTarget = JvmTarget.fromTarget("17")
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
     compileOptions {
diff --git a/Jetchat/build.gradle.kts b/Jetchat/build.gradle.kts
index 1c48db092..e0ceb9e19 100644
--- a/Jetchat/build.gradle.kts
+++ b/Jetchat/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false
diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml
index cf10a7f86..0f1c47f8f 100644
--- a/Jetchat/gradle/libs.versions.toml
+++ b/Jetchat/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 [versions]
 accompanist = "0.37.3"
 android-material3 = "1.14.0-alpha08"
-androidGradlePlugin = "8.13.2"
+androidGradlePlugin = "9.0.0"
 androidx-activity-compose = "1.12.2"
 androidx-appcompat = "1.7.1"
 androidx-compose-bom = "2026.01.00"
@@ -34,7 +34,7 @@ compileSdk = "36"
 coroutines = "1.10.2"
 google-maps = "20.0.0"
 gradle-versions = "0.53.0"
-hilt = "2.57.2"
+hilt = "2.59"
 hiltExt = "1.3.0"
 horologist = "0.7.15"
 jdkDesugar = "2.1.5"
@@ -42,7 +42,7 @@ junit = "4.13.2"
 kotlin = "2.3.0"
 kotlinx-serialization-json = "1.9.0"
 kotlinx_immutable = "0.4.0"
-ksp = "2.3.4"
+ksp = "2.3.5"
 maps-compose = "7.0.0"
 # @keep
 minSdk = "23"
@@ -55,7 +55,7 @@ room = "2.8.4"
 secrets = "2.0.1"
 spotless = "8.1.0"
 # @keep
-targetSdk = "33"
+targetSdk = "36"
 version-catalog-update = "1.0.1"
 
 [libraries]
@@ -166,8 +166,6 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", 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" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties
index d6c8bc7bf..66c387817 100644
--- a/Jetchat/gradle/wrapper/gradle-wrapper.properties
+++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists