Merge branch 'master' of github.com:open-tool/ultron into platforms-e…

…xtend
open-tool · Jul 30, 2024 · 7b3b09e · 7b3b09e
2 parents 32115e3 + 4db0a4e
commit 7b3b09e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,4 +14,4 @@ kotlin.mpp.enableCInteropCommonization=true
 
 GROUP=com.atiurin
 POM_ARTIFACT_ID=ultron
-VERSION_NAME=2.5.0-alpha10
+VERSION_NAME=2.5.0-alpha12
diff --git a/ultron-allure/build.gradle.kts b/ultron-allure/build.gradle.kts
@@ -9,6 +9,9 @@ plugins {
 group = project.findProperty("GROUP")!!
 version =  project.findProperty("VERSION_NAME")!!
 
+kotlin {
+    jvmToolchain(11)
+}
 
 android {
     namespace = "com.atiurin.ultron.allure"
@@ -26,8 +29,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_17
-        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 
     publishing {

diff --git a/ultron-android/build.gradle.kts b/ultron-android/build.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 group = project.findProperty("GROUP")!!
 version = project.findProperty("VERSION_NAME")!!
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     namespace = "com.atiurin.ultron.android"
     compileSdk = 34
@@ -19,8 +23,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     publishing {

diff --git a/ultron-common/build.gradle.kts b/ultron-common/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     jvm("desktop")
@@ -112,8 +112,8 @@ android {
         minSdk = 21
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
 

diff --git a/ultron-compose/build.gradle.kts b/ultron-compose/build.gradle.kts
@@ -25,7 +25,7 @@ kotlin {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     jvm("desktop")
@@ -117,8 +117,8 @@ android {
         multiDexEnabled = true
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_17
-        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 }