From 4db0a4ef49a5c1521ff3c5ea8fad3a0ae2c7aad7 Mon Sep 17 00:00:00 2001 From: Aleksei Tiurin Date: Tue, 30 Jul 2024 00:47:29 +0300 Subject: [PATCH] 2.5.0-alpha12 (#82) * java 11 dowgrade * jvmToolchain --- gradle.properties | 2 +- ultron-allure/build.gradle.kts | 7 +++++-- ultron-android/build.gradle.kts | 8 ++++++-- ultron-common/build.gradle.kts | 6 +++--- ultron-compose/build.gradle.kts | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 58baa81..878b62e 100644 --- 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 index 8fb01c6..57c874d 100644 --- 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 index 8c3ffdb..536e881 100644 --- 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 index eef7062..be4b9ec 100644 --- a/ultron-common/build.gradle.kts +++ b/ultron-common/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { publishLibraryVariants("release") @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_11) } } applyDefaultHierarchyTemplate() @@ -85,8 +85,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 index 4828195..16af9ee 100644 --- 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) } } @OptIn(ExperimentalKotlinGradlePluginApi::class) @@ -92,8 +92,8 @@ android { multiDexEnabled = true } compileOptions { - targetCompatibility = JavaVersion.VERSION_17 - sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } }