Use Java 11 for Desktop JVM

MatkovIvan · MatkovIvan · commit ff6c7eba2d21 · 2025-05-02T15:01:21.000+02:00
diff --git a/projects/core/koin-core-viewmodel-navigation/build.gradle.kts b/projects/core/koin-core-viewmodel-navigation/build.gradle.kts
@@ -1,18 +1,23 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
+    alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
 }
 
 val koinVersion: String by project
 version = koinVersion
 
 kotlin {
-    
+    androidTarget {
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions.jvmTarget = "1.8"
+        }
+    }
+
     jvm {
-        withJava()
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
     }
 
     js(IR) {
@@ -40,10 +45,11 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
-    }
+val androidCompileSDK: String by project
+
+android {
+    namespace = "org.koin.viewmodel.navigation"
+    compileSdk = androidCompileSDK.toInt()
 }
 
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/core/koin-core-viewmodel/build.gradle.kts b/projects/core/koin-core-viewmodel/build.gradle.kts
@@ -1,18 +1,23 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
+    alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
 }
 
 val koinVersion: String by project
 version = koinVersion
 
 kotlin {
+    androidTarget {
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions.jvmTarget = "1.8"
+        }
+    }
     
     jvm {
-        withJava()
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
     }
 
 //    // Enable context receivers for all targets
@@ -54,10 +59,11 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
-    }
+val androidCompileSDK: String by project
+
+android {
+    namespace = "org.koin.viewmodel"
+    compileSdk = androidCompileSDK.toInt()
 }
 
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/core/koin-fu-viewmodel/build.gradle.kts b/projects/core/koin-fu-viewmodel/build.gradle.kts
@@ -1,14 +1,20 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
+    alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
 }
 
 kotlin {
-    
+    androidTarget {
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions.jvmTarget = "1.8"
+        }
+    }
+
     jvm {
-        withJava()
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
     }
 
     sourceSets {
@@ -22,10 +28,11 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
-        }
+val androidCompileSDK: String by project
+
+android {
+    namespace = "org.koin.dsl.fu"
+    compileSdk = androidCompileSDK.toInt()
 }
 
 apply(from = file("../../gradle/publish.gradle.kts"))
