Skip to content

Commit 13e0677

Browse files
committed
migrate from kotlinOptions {} to kotlin.compilerOptions {}
1 parent 7427bb9 commit 13e0677

File tree

20 files changed

+119
-40
lines changed

20 files changed

+119
-40
lines changed

admob/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -27,8 +29,10 @@ android {
2729
sourceCompatibility = JavaVersion.VERSION_17
2830
targetCompatibility = JavaVersion.VERSION_17
2931
}
30-
kotlinOptions {
31-
jvmTarget = "17"
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget = JvmTarget.fromTarget("17")
35+
}
3236
}
3337
}
3438

analytics/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -27,8 +29,10 @@ android {
2729
sourceCompatibility = JavaVersion.VERSION_17
2830
targetCompatibility = JavaVersion.VERSION_17
2931
}
30-
kotlinOptions {
31-
jvmTarget = "17"
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget = JvmTarget.fromTarget("17")
35+
}
3236
}
3337
}
3438

appcheck/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -28,8 +30,10 @@ android {
2830
sourceCompatibility = JavaVersion.VERSION_17
2931
targetCompatibility = JavaVersion.VERSION_17
3032
}
31-
kotlinOptions {
32-
jvmTarget = "17"
33+
kotlin {
34+
compilerOptions {
35+
jvmTarget = JvmTarget.fromTarget("17")
36+
}
3337
}
3438
}
3539

auth/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -25,8 +27,10 @@ android {
2527
sourceCompatibility = JavaVersion.VERSION_17
2628
targetCompatibility = JavaVersion.VERSION_17
2729
}
28-
kotlinOptions {
29-
jvmTarget = "17"
30+
kotlin {
31+
compilerOptions {
32+
jvmTarget = JvmTarget.fromTarget("17")
33+
}
3034
}
3135
}
3236

config/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -26,8 +28,10 @@ android {
2628
sourceCompatibility = JavaVersion.VERSION_17
2729
targetCompatibility = JavaVersion.VERSION_17
2830
}
29-
kotlinOptions {
30-
jvmTarget = "17"
31+
kotlin {
32+
compilerOptions {
33+
jvmTarget = JvmTarget.fromTarget("17")
34+
}
3135
}
3236
}
3337

crashlytics/app/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
plugins {
23
id("com.android.application")
34
id("kotlin-android")
@@ -28,8 +29,10 @@ android {
2829
sourceCompatibility = JavaVersion.VERSION_17
2930
targetCompatibility = JavaVersion.VERSION_17
3031
}
31-
kotlinOptions {
32-
jvmTarget = "17"
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget = JvmTarget.fromTarget("17")
35+
}
3336
}
3437
}
3538

database/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -30,8 +32,10 @@ android {
3032
sourceCompatibility = JavaVersion.VERSION_17
3133
targetCompatibility = JavaVersion.VERSION_17
3234
}
33-
kotlinOptions {
34-
jvmTarget = "17"
35+
kotlin {
36+
compilerOptions {
37+
jvmTarget = JvmTarget.fromTarget("17")
38+
}
3539
}
3640
buildFeatures {
3741
viewBinding = true

firebase-ai/app/build.gradle.kts

Lines changed: 6 additions & 2 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
alias(libs.plugins.androidApplication)
35
alias(libs.plugins.jetbrainsKotlinAndroid)
@@ -34,8 +36,10 @@ android {
3436
sourceCompatibility = JavaVersion.VERSION_17
3537
targetCompatibility = JavaVersion.VERSION_17
3638
}
37-
kotlinOptions {
38-
jvmTarget = "17"
39+
kotlin {
40+
compilerOptions {
41+
jvmTarget = JvmTarget.fromTarget("17")
42+
}
3943
}
4044
buildFeatures {
4145
compose = true

firebaseoptions/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -26,8 +28,10 @@ android {
2628
sourceCompatibility = JavaVersion.VERSION_17
2729
targetCompatibility = JavaVersion.VERSION_17
2830
}
29-
kotlinOptions {
30-
jvmTarget = "17"
31+
kotlin {
32+
compilerOptions {
33+
jvmTarget = JvmTarget.fromTarget("17")
34+
}
3135
}
3236
}
3337

firestore/app/build.gradle.kts

Lines changed: 6 additions & 2 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("kotlin-android")
@@ -27,8 +29,10 @@ android {
2729
sourceCompatibility = JavaVersion.VERSION_17
2830
targetCompatibility = JavaVersion.VERSION_17
2931
}
30-
kotlinOptions {
31-
jvmTarget = "17"
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget = JvmTarget.fromTarget("17")
35+
}
3236
}
3337
lint {
3438
warning += "InvalidPackage"

0 commit comments

Comments
 (0)