chore: address Gradle 9 deprecations

thatfiredev · thatfiredev · commit e53fcd8655c2 · 2025-06-20T01:20:02.000+01:00
diff --git a/admob/app/build.gradle.kts b/admob/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -38,8 +39,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     buildFeatures {
         viewBinding = true
diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -36,8 +37,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/appdistribution/app/build.gradle.kts b/appdistribution/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -29,8 +31,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     buildFeatures {
         viewBinding = true
diff --git a/appdistribution/build.gradle.kts b/appdistribution/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -36,8 +37,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 }
 
 tasks.register<JavaExec>("ktlintCheck") {
-    val outputDir = "${project.buildDir}/reports/ktlint/"
+    val outputDir = "${project.layout.buildDirectory}/reports/ktlint/"
     val inputFiles = project.fileTree("src").include("**/*.kt")
     val outputFile = "${outputDir}ktlint-checkstyle-report.xml"
 
@@ -85,6 +85,6 @@ tasks.withType<DependencyUpdatesTask> {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -34,8 +35,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/crash/app/build.gradle.kts b/crash/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -40,8 +41,11 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/crash/build.gradle.kts b/crash/build.gradle.kts
@@ -18,6 +18,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -35,8 +36,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/dynamiclinks/app/build.gradle.kts b/dynamiclinks/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -46,8 +47,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/dynamiclinks/build.gradle.kts b/dynamiclinks/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git 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 {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -33,8 +35,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
     buildFeatures {
         compose = true
diff --git 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")
@@ -33,8 +35,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
@@ -18,6 +18,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git 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")
@@ -32,8 +34,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/functions/build.gradle.kts b/functions/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git 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")
@@ -28,8 +30,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/inappmessaging/build.gradle.kts b/inappmessaging/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -38,8 +39,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.google.firebase.perf.plugin.FirebasePerfExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -43,8 +44,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     buildFeatures {
         viewBinding = true
diff --git a/perf/build.gradle.kts b/perf/build.gradle.kts
@@ -18,6 +18,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -34,8 +35,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     buildFeatures {
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
@@ -17,6 +17,6 @@ allprojects {
 
 tasks {
     register("clean", Delete::class) {
-        delete(rootProject.buildDir)
+        delete(rootProject.layout.buildDirectory)
     }
 }
diff --git a/vertexai/app/build.gradle.kts b/vertexai/app/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ allprojects {`
`17`	`17`
`18`	`18`	`tasks {`
`19`	`19`	`register("clean", Delete::class) {`
`20`		`- delete(rootProject.buildDir)`
	`20`	`+ delete(rootProject.layout.buildDirectory)`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dependencies {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`tasks.register<JavaExec>("ktlintCheck") {`
`34`		`- val outputDir = "${project.buildDir}/reports/ktlint/"`
	`34`	`+ val outputDir = "${project.layout.buildDirectory}/reports/ktlint/"`
`35`	`35`	`val inputFiles = project.fileTree("src").include("*/.kt")`
`36`	`36`	`val outputFile = "${outputDir}ktlint-checkstyle-report.xml"`
`37`	`37`
`@@ -85,6 +85,6 @@ tasks.withType<DependencyUpdatesTask> {`
`85`	`85`
`86`	`86`	`tasks {`
`87`	`87`	`register("clean", Delete::class) {`
`88`		`- delete(rootProject.buildDir)`
	`88`	`+ delete(rootProject.layout.buildDirectory)`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ allprojects {`
`18`	`18`
`19`	`19`	`tasks {`
`20`	`20`	`register("clean", Delete::class) {`
`21`		`- delete(rootProject.buildDir)`
	`21`	`+ delete(rootProject.layout.buildDirectory)`
`22`	`22`	`}`
`23`	`23`	`}`