From 673e956a349e06ad58bfb29a1c706ed21b05feb1 Mon Sep 17 00:00:00 2001
From: Arnaud Giuliani <giuliani.arnaud@gmail.com>
Date: Mon, 16 Sep 2024 15:54:25 +0200
Subject: [PATCH] Fix gradle config to ensure java 1.8

---
 .../koin-androidx-compose-navigation/build.gradle.kts       | 5 +----
 projects/compose/koin-androidx-compose/build.gradle.kts     | 5 +----
 .../koin-compose-viewmodel-navigation/build.gradle.kts      | 4 ++--
 projects/compose/koin-compose-viewmodel/build.gradle.kts    | 4 ++--
 projects/compose/koin-compose/build.gradle.kts              | 6 ------
 .../core/koin-core-viewmodel-navigation/build.gradle.kts    | 6 ------
 projects/core/koin-core-viewmodel/build.gradle.kts          | 6 ------
 7 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/projects/compose/koin-androidx-compose-navigation/build.gradle.kts b/projects/compose/koin-androidx-compose-navigation/build.gradle.kts
index b8c0e4fc1..6bf37028c 100644
--- a/projects/compose/koin-androidx-compose-navigation/build.gradle.kts
+++ b/projects/compose/koin-androidx-compose-navigation/build.gradle.kts
@@ -16,11 +16,8 @@ val androidMinSDK : String by project
 android {
     namespace = "org.koin.androidx.compose.navigation"
     compileSdk = androidCompileSDK.toInt()
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-    }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
     defaultConfig {
         minSdk = androidMinSDK.toInt()
diff --git a/projects/compose/koin-androidx-compose/build.gradle.kts b/projects/compose/koin-androidx-compose/build.gradle.kts
index 5bc172a83..ccc8d2985 100644
--- a/projects/compose/koin-androidx-compose/build.gradle.kts
+++ b/projects/compose/koin-androidx-compose/build.gradle.kts
@@ -16,11 +16,8 @@ val androidMinSDK : String by project
 android {
     namespace = "org.koin.androidx.compose"
     compileSdk = androidCompileSDK.toInt()
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-    }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
     defaultConfig {
         minSdk = androidMinSDK.toInt()
diff --git a/projects/compose/koin-compose-viewmodel-navigation/build.gradle.kts b/projects/compose/koin-compose-viewmodel-navigation/build.gradle.kts
index 4f1f72ba3..3ca97ed55 100644
--- a/projects/compose/koin-compose-viewmodel-navigation/build.gradle.kts
+++ b/projects/compose/koin-compose-viewmodel-navigation/build.gradle.kts
@@ -44,8 +44,8 @@ kotlin {
 }
 
 tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
     }
 }
 
diff --git a/projects/compose/koin-compose-viewmodel/build.gradle.kts b/projects/compose/koin-compose-viewmodel/build.gradle.kts
index 0ab18129b..d15cbe2fe 100644
--- a/projects/compose/koin-compose-viewmodel/build.gradle.kts
+++ b/projects/compose/koin-compose-viewmodel/build.gradle.kts
@@ -44,8 +44,8 @@ kotlin {
 }
 
 tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
     }
 }
 
diff --git a/projects/compose/koin-compose/build.gradle.kts b/projects/compose/koin-compose/build.gradle.kts
index 4b4b479f8..d379c1881 100644
--- a/projects/compose/koin-compose/build.gradle.kts
+++ b/projects/compose/koin-compose/build.gradle.kts
@@ -41,12 +41,6 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
 tasks.withType<KotlinCompile>().all {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
diff --git a/projects/core/koin-core-viewmodel-navigation/build.gradle.kts b/projects/core/koin-core-viewmodel-navigation/build.gradle.kts
index 1a74727c0..b34efaf7b 100644
--- a/projects/core/koin-core-viewmodel-navigation/build.gradle.kts
+++ b/projects/core/koin-core-viewmodel-navigation/build.gradle.kts
@@ -40,12 +40,6 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
 tasks.withType<KotlinCompile>().all {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
diff --git a/projects/core/koin-core-viewmodel/build.gradle.kts b/projects/core/koin-core-viewmodel/build.gradle.kts
index b18f669e6..f465a3a9b 100644
--- a/projects/core/koin-core-viewmodel/build.gradle.kts
+++ b/projects/core/koin-core-viewmodel/build.gradle.kts
@@ -43,12 +43,6 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
 tasks.withType<KotlinCompile>().all {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)