From d6cde6ecf33b504eacb349376991da90e1674c3a Mon Sep 17 00:00:00 2001 From: DPE bot Date: Fri, 19 Dec 2025 05:55:20 -0500 Subject: [PATCH 1/2] Auto-update dependencies. --- admob/build.gradle.kts | 2 +- analytics/build.gradle.kts | 2 +- appcheck/build.gradle.kts | 2 +- auth/app/build.gradle.kts | 2 +- auth/build.gradle.kts | 2 +- build.gradle.kts | 2 +- config/build.gradle.kts | 2 +- crashlytics/build.gradle.kts | 2 +- database/build.gradle.kts | 2 +- firebaseoptions/build.gradle.kts | 2 +- firestore/build.gradle.kts | 2 +- functions/build.gradle.kts | 2 +- gradle/libs.versions.toml | 6 +++--- inappmessaging/build.gradle.kts | 2 +- installations/build.gradle.kts | 2 +- messaging/build.gradle.kts | 2 +- ml-functions/build.gradle.kts | 2 +- mlkit/build.gradle.kts | 2 +- perf/build.gradle.kts | 2 +- storage/app/build.gradle.kts | 2 +- storage/build.gradle.kts | 2 +- tasks/build.gradle.kts | 2 +- test-lab/build.gradle.kts | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/admob/build.gradle.kts b/admob/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/admob/build.gradle.kts +++ b/admob/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts index 8cfabedd..ea2665bf 100644 --- a/analytics/build.gradle.kts +++ b/analytics/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/appcheck/build.gradle.kts b/appcheck/build.gradle.kts index 06145978..e917fb3f 100644 --- a/appcheck/build.gradle.kts +++ b/appcheck/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts index 7ee4dc71..aa9bf664 100644 --- a/auth/app/build.gradle.kts +++ b/auth/app/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { implementation("androidx.cardview:cardview:1.0.0") implementation("androidx.constraintlayout:constraintlayout:2.2.1") implementation("com.google.android.material:material:1.13.0") - implementation("androidx.activity:activity-ktx:1.12.1") + implementation("androidx.activity:activity-ktx:1.12.2") // Import the BoM for the Firebase platform implementation(platform("com.google.firebase:firebase-bom:34.7.0")) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/build.gradle.kts b/build.gradle.kts index 61f59e13..23d93c56 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false id("com.google.firebase.crashlytics") version "3.0.6" apply false id("com.google.firebase.firebase-perf") version "2.0.2" apply false diff --git a/config/build.gradle.kts b/config/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/config/build.gradle.kts +++ b/config/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/crashlytics/build.gradle.kts b/crashlytics/build.gradle.kts index d4e010ea..9c0fb8ce 100644 --- a/crashlytics/build.gradle.kts +++ b/crashlytics/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false id("com.google.firebase.crashlytics") version "3.0.6" apply false } diff --git a/database/build.gradle.kts b/database/build.gradle.kts index 88ff650e..56776ea1 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/firebaseoptions/build.gradle.kts b/firebaseoptions/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/firebaseoptions/build.gradle.kts +++ b/firebaseoptions/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/firestore/build.gradle.kts +++ b/firestore/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/functions/build.gradle.kts b/functions/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/functions/build.gradle.kts +++ b/functions/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64f7bd85..787fab22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,15 +2,15 @@ agp = "8.13.2" firebaseAi = "17.7.0" guava = "32.0.1-android" -kotlin = "2.2.21" +kotlin = "2.3.0" coreKtx = "1.17.0" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" kotlinxSerializationJson = "1.9.0" lifecycleRuntimeKtx = "2.10.0" -activityCompose = "1.12.1" -composeBom = "2025.12.00" +activityCompose = "1.12.2" +composeBom = "2025.12.01" reactiveStreams = "1.0.4" vertexAI = "16.5.0" diff --git a/inappmessaging/build.gradle.kts b/inappmessaging/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/inappmessaging/build.gradle.kts +++ b/inappmessaging/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/installations/build.gradle.kts b/installations/build.gradle.kts index 5b7edceb..e837e6ab 100644 --- a/installations/build.gradle.kts +++ b/installations/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/messaging/build.gradle.kts b/messaging/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/messaging/build.gradle.kts +++ b/messaging/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/ml-functions/build.gradle.kts b/ml-functions/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/ml-functions/build.gradle.kts +++ b/ml-functions/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/mlkit/build.gradle.kts b/mlkit/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/mlkit/build.gradle.kts +++ b/mlkit/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/perf/build.gradle.kts b/perf/build.gradle.kts index 0c5c9950..2400a380 100644 --- a/perf/build.gradle.kts +++ b/perf/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false id("com.google.firebase.firebase-perf") version "2.0.2" apply false } diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts index 31b75dfe..a77436b5 100644 --- a/storage/app/build.gradle.kts +++ b/storage/app/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.application") id("kotlin-android") id("com.google.gms.google-services") - id("com.google.devtools.ksp") version "2.3.3" + id("com.google.devtools.ksp") version "2.3.4" } android { diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/storage/build.gradle.kts +++ b/storage/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/tasks/build.gradle.kts b/tasks/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/tasks/build.gradle.kts +++ b/tasks/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } diff --git a/test-lab/build.gradle.kts b/test-lab/build.gradle.kts index 058d3e09..69dea58a 100644 --- a/test-lab/build.gradle.kts +++ b/test-lab/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.13.2" apply false id("com.android.library") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.21" apply false + id("org.jetbrains.kotlin.android") version "2.3.0" apply false id("com.google.gms.google-services") version "4.4.4" apply false } From 925ca50328c14aa3f34780ae3c92bfa226b0eaba Mon Sep 17 00:00:00 2001 From: Rosario Fernandes Date: Fri, 19 Dec 2025 14:48:25 +0000 Subject: [PATCH 2/2] migrate from kotlinOptions {} to kotlin.compilerOptions {} --- admob/app/build.gradle.kts | 8 ++++++-- analytics/app/build.gradle.kts | 8 ++++++-- appcheck/app/build.gradle.kts | 8 ++++++-- auth/app/build.gradle.kts | 8 ++++++-- config/app/build.gradle.kts | 8 ++++++-- crashlytics/app/build.gradle.kts | 7 +++++-- database/app/build.gradle.kts | 8 ++++++-- firebase-ai/app/build.gradle.kts | 8 ++++++-- firebaseoptions/app/build.gradle.kts | 8 ++++++-- firestore/app/build.gradle.kts | 8 ++++++-- functions/app/build.gradle.kts | 8 ++++++-- inappmessaging/app/build.gradle.kts | 8 ++++++-- installations/app/build.gradle.kts | 8 ++++++-- messaging/app/build.gradle.kts | 8 ++++++-- ml-functions/app/build.gradle.kts | 8 ++++++-- mlkit/app/build.gradle.kts | 8 ++++++-- perf/app/build.gradle.kts | 8 ++++++-- storage/app/build.gradle.kts | 8 ++++++-- tasks/app/build.gradle.kts | 8 ++++++-- test-lab/app/build.gradle.kts | 8 ++++++-- 20 files changed, 119 insertions(+), 40 deletions(-) diff --git a/admob/app/build.gradle.kts b/admob/app/build.gradle.kts index a7eaafde..f9eb570b 100644 --- a/admob/app/build.gradle.kts +++ b/admob/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts index d42266a5..0e5c720d 100644 --- a/analytics/app/build.gradle.kts +++ b/analytics/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/appcheck/app/build.gradle.kts b/appcheck/app/build.gradle.kts index 25de2db0..ef3ade56 100644 --- a/appcheck/app/build.gradle.kts +++ b/appcheck/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -28,8 +30,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts index aa9bf664..20c500a0 100644 --- a/auth/app/build.gradle.kts +++ b/auth/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -25,8 +27,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts index b783669b..487ee484 100644 --- a/config/app/build.gradle.kts +++ b/config/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/crashlytics/app/build.gradle.kts b/crashlytics/app/build.gradle.kts index 52723bc5..7036b163 100644 --- a/crashlytics/app/build.gradle.kts +++ b/crashlytics/app/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("com.android.application") id("kotlin-android") @@ -28,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts index 899b283a..ad38f517 100644 --- a/database/app/build.gradle.kts +++ b/database/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -30,8 +32,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } buildFeatures { viewBinding = true diff --git a/firebase-ai/app/build.gradle.kts b/firebase-ai/app/build.gradle.kts index cc7e8fbd..d97393ce 100644 --- a/firebase-ai/app/build.gradle.kts +++ b/firebase-ai/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsKotlinAndroid) @@ -34,8 +36,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } buildFeatures { compose = true diff --git a/firebaseoptions/app/build.gradle.kts b/firebaseoptions/app/build.gradle.kts index 3a66782b..ce43ea1a 100644 --- a/firebaseoptions/app/build.gradle.kts +++ b/firebaseoptions/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts index 462c47d7..1bd8eb28 100644 --- a/firestore/app/build.gradle.kts +++ b/firestore/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } lint { warning += "InvalidPackage" diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts index 8b979233..db5025d4 100644 --- a/functions/app/build.gradle.kts +++ b/functions/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts index 4b6fb72e..15f87588 100644 --- a/inappmessaging/app/build.gradle.kts +++ b/inappmessaging/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } lint { // TODO(thatfiredev): Remove this once diff --git a/installations/app/build.gradle.kts b/installations/app/build.gradle.kts index d25c153f..6d9cb762 100644 --- a/installations/app/build.gradle.kts +++ b/installations/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts index eb811ea0..3a3c5035 100644 --- a/messaging/app/build.gradle.kts +++ b/messaging/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/ml-functions/app/build.gradle.kts b/ml-functions/app/build.gradle.kts index 4f97f571..ced52755 100644 --- a/ml-functions/app/build.gradle.kts +++ b/ml-functions/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -31,8 +33,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } buildFeatures { viewBinding = true diff --git a/mlkit/app/build.gradle.kts b/mlkit/app/build.gradle.kts index 236b8f5c..11e6709e 100644 --- a/mlkit/app/build.gradle.kts +++ b/mlkit/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -30,8 +32,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } packaging { resources.excludes += "META-INF/androidx.exifinterface_exifinterface.version" diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts index 56c46d5d..6e1414a8 100644 --- a/perf/app/build.gradle.kts +++ b/perf/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -28,8 +30,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts index a77436b5..1425a647 100644 --- a/storage/app/build.gradle.kts +++ b/storage/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -31,8 +33,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/tasks/app/build.gradle.kts b/tasks/app/build.gradle.kts index 1e13a0f7..d7003fee 100644 --- a/tasks/app/build.gradle.kts +++ b/tasks/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } } diff --git a/test-lab/app/build.gradle.kts b/test-lab/app/build.gradle.kts index fbee8069..4912fdcb 100644 --- a/test-lab/app/build.gradle.kts +++ b/test-lab/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("kotlin-android") @@ -26,8 +28,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } }