JVM toolchain

michaelbel · Jul 15, 2024 · 91f5d00 · 91f5d00
1 parent 4b212d1
commit 91f5d00
Show file tree

Hide file tree

Showing 34 changed files with 302 additions and 322 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,8 +31,4 @@ subprojects {
     if (name != "desktopApp") {
         apply(plugin = "io.gitlab.arturbosch.detekt")
     }
-}
-
-extra.apply {
-    set("jvmTarget", "11")
 }
diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -22,6 +20,10 @@ kotlin {
             implementation(libs.bundles.koin.android)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -1,3 +1,7 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.compose)
@@ -6,13 +10,7 @@ plugins {
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -41,6 +39,10 @@ kotlin {
             api(libs.bundles.jetbrains.androidx.lifecycle.viewmodel.compose.common)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts
@@ -1,3 +1,7 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.compose)
@@ -6,13 +10,7 @@ plugins {
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -25,6 +23,10 @@ kotlin {
             implementation(libs.bundles.room.paging.common)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -26,6 +24,10 @@ kotlin {
             api(libs.bundles.jetbrains.androidx.lifecycle.viewmodel.compose.common)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -15,13 +18,7 @@ private val tmdbApiKey: String by lazy {
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -37,6 +34,10 @@ kotlin {
             implementation(libs.bundles.koin.android)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/notifications/build.gradle.kts b/core/notifications/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -19,6 +17,10 @@ kotlin {
             implementation(project(":core:ui"))
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/persistence/build.gradle.kts b/core/persistence/build.gradle.kts
@@ -1,3 +1,7 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
@@ -6,13 +10,7 @@ plugins {
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -32,6 +30,10 @@ kotlin {
             implementation(libs.bundles.datastore.desktop)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/platform-services/foss/build.gradle.kts b/core/platform-services/foss/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -20,6 +18,10 @@ kotlin {
             implementation(libs.bundles.koin.common)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/platform-services/gms/build.gradle.kts b/core/platform-services/gms/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -26,6 +24,10 @@ kotlin {
             implementation(libs.bundles.koin.android)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/platform-services/hms/build.gradle.kts b/core/platform-services/hms/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -20,6 +18,10 @@ kotlin {
             implementation(libs.bundles.koin.common)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {

diff --git a/core/platform-services/inject-android/build.gradle.kts b/core/platform-services/inject-android/build.gradle.kts
@@ -1,16 +1,14 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -22,6 +20,10 @@ kotlin {
             implementation(libs.bundles.koin.android)
         }
     }
+
+    compilerOptions {
+        jvmToolchain(libs.versions.jdk.get().toInt())
+    }
 }
 
 android {