Skip to content

Commit 5d11be0

Browse files
committed
Update Kotlin 2.2.0
1 parent ad3bbe3 commit 5d11be0

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

app/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id 'com.android.application'
35
id 'org.jetbrains.kotlin.android'
@@ -29,9 +31,6 @@ android {
2931
sourceCompatibility JavaVersion.VERSION_17
3032
targetCompatibility JavaVersion.VERSION_17
3133
}
32-
kotlinOptions {
33-
jvmTarget = '17'
34-
}
3534

3635
buildFeatures {
3736
dataBinding = true
@@ -44,6 +43,12 @@ android {
4443
}
4544
}
4645

46+
kotlin {
47+
compilerOptions {
48+
jvmTarget = JvmTarget.JVM_17
49+
}
50+
}
51+
4752
dependencies {
4853
lintChecks project(':lint')
4954

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ plugins {
33
alias(libs.plugins.android.library) apply false
44
alias(libs.plugins.kotlin.android) apply false
55
alias(libs.plugins.kotlin.compose) apply false
6+
alias(libs.plugins.kotlin.jvm) apply false
67
}
78

89
tasks.register('clean', Delete) {
910
delete rootProject.buildDir
11+
finalizedBy(':lint:assemble')
1012
}

gradle/libs.versions.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
agp = "8.11.0"
33
lint = "31.11.0"
4-
kotlin = "2.1.21"
4+
kotlin = "2.2.0"
55
compose-bom = "2025.06.01"
66

77
[libraries]
@@ -57,4 +57,5 @@ androidX-compose-debug = [
5757
android-application = { id = "com.android.application", version.ref = "agp" }
5858
android-library = { id = "com.android.library", version.ref = "agp" }
5959
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
60-
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
60+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
61+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

lint/build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
apply plugin: 'java-library'
2-
apply plugin: 'kotlin'
1+
plugins {
2+
id 'java-library'
3+
alias(libs.plugins.kotlin.jvm)
4+
}
35

4-
sourceCompatibility = JavaVersion.VERSION_21
5-
targetCompatibility = JavaVersion.VERSION_21
6+
java {
7+
sourceCompatibility JavaVersion.VERSION_21
8+
targetCompatibility JavaVersion.VERSION_21
9+
}
610

711
dependencies {
812
// Lint

0 commit comments

Comments
 (0)