Skip to content

Commit 5ad41b4

Browse files
committed
Migrate Jetchat to AGP 9.0
GiAS prepared this by relying on AKB tools.
1 parent 30e3acd commit 5ad41b4

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

Jetchat/app/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1919

2020
plugins {
2121
alias(libs.plugins.android.application)
22-
alias(libs.plugins.kotlin.android)
2322
alias(libs.plugins.compose)
2423
}
2524

@@ -67,7 +66,7 @@ android {
6766

6867
kotlin {
6968
compilerOptions {
70-
jvmTarget = JvmTarget.fromTarget("17")
69+
jvmTarget.set(JvmTarget.JVM_17)
7170
}
7271
}
7372
compileOptions {

Jetchat/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ plugins {
1818
alias(libs.plugins.gradle.versions)
1919
alias(libs.plugins.version.catalog.update)
2020
alias(libs.plugins.android.application) apply false
21-
alias(libs.plugins.kotlin.android) apply false
2221
alias(libs.plugins.kotlin.parcelize) apply false
2322
alias(libs.plugins.compose) apply false
2423
alias(libs.plugins.spotless) apply false

Jetchat/gradle/libs.versions.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[versions]
66
accompanist = "0.37.3"
77
android-material3 = "1.14.0-alpha08"
8-
androidGradlePlugin = "8.13.2"
8+
androidGradlePlugin = "9.0.0"
99
androidx-activity-compose = "1.12.2"
1010
androidx-appcompat = "1.7.1"
1111
androidx-compose-bom = "2026.01.00"
@@ -34,15 +34,15 @@ compileSdk = "36"
3434
coroutines = "1.10.2"
3535
google-maps = "20.0.0"
3636
gradle-versions = "0.53.0"
37-
hilt = "2.57.2"
37+
hilt = "2.59"
3838
hiltExt = "1.3.0"
3939
horologist = "0.7.15"
4040
jdkDesugar = "2.1.5"
4141
junit = "4.13.2"
4242
kotlin = "2.3.0"
4343
kotlinx-serialization-json = "1.9.0"
4444
kotlinx_immutable = "0.4.0"
45-
ksp = "2.3.4"
45+
ksp = "2.3.5"
4646
maps-compose = "7.0.0"
4747
# @keep
4848
minSdk = "23"
@@ -55,7 +55,7 @@ room = "2.8.4"
5555
secrets = "2.0.1"
5656
spotless = "8.1.0"
5757
# @keep
58-
targetSdk = "33"
58+
targetSdk = "36"
5959
version-catalog-update = "1.0.1"
6060

6161
[libraries]
@@ -166,8 +166,6 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
166166
compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
167167
gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
168168
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
169-
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
170-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
171169
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
172170
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
173171
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

Jetchat/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414

1515
distributionBase=GRADLE_USER_HOME
1616
distributionPath=wrapper/dists
17-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
17+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
1818
zipStoreBase=GRADLE_USER_HOME
1919
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)