From 7693eb9f5bb6ca9b1b0bd1dd2e2e3822a387c8ad Mon Sep 17 00:00:00 2001 From: Fabian Bender Date: Fri, 29 May 2026 09:11:21 +0200 Subject: [PATCH] reset the target bytecode back to 17 --- accessibility-toolbox/build.gradle.kts | 10 +++++++--- core/build.gradle.kts | 10 +++++++--- mlkit-scanner-engine/build.gradle.kts | 10 +++++++--- settings.gradle.kts | 4 ++++ ui-toolkit/build.gradle.kts | 10 +++++++--- ui/build.gradle.kts | 10 +++++++--- utils/build.gradle.kts | 10 +++++++--- 7 files changed, 46 insertions(+), 18 deletions(-) diff --git a/accessibility-toolbox/build.gradle.kts b/accessibility-toolbox/build.gradle.kts index 8da11d89f..9e5ccf139 100644 --- a/accessibility-toolbox/build.gradle.kts +++ b/accessibility-toolbox/build.gradle.kts @@ -35,13 +35,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -53,6 +53,10 @@ android { } } +kotlin { + jvmToolchain(21) +} + dependencies { implementation(project(":utils")) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 832285481..952deba08 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -39,13 +39,13 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -63,6 +63,10 @@ android { } } +kotlin { + jvmToolchain(21) +} + dependencies { coreLibraryDesugaring(libs.desugarJdkLibsNio) diff --git a/mlkit-scanner-engine/build.gradle.kts b/mlkit-scanner-engine/build.gradle.kts index 0f3fde38d..4762df74d 100644 --- a/mlkit-scanner-engine/build.gradle.kts +++ b/mlkit-scanner-engine/build.gradle.kts @@ -34,13 +34,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -53,6 +53,10 @@ android { } } +kotlin { + jvmToolchain(21) +} + dependencies { implementation(project(":core")) implementation(project(":ui")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 64007c00c..21275782c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + include( ":core", "kotlin-sample", diff --git a/ui-toolkit/build.gradle.kts b/ui-toolkit/build.gradle.kts index ecf0a1188..f67da5128 100644 --- a/ui-toolkit/build.gradle.kts +++ b/ui-toolkit/build.gradle.kts @@ -37,13 +37,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -66,6 +66,10 @@ android { } +kotlin { + jvmToolchain(21) +} + dependencies { implementation(project(":accessibility-toolbox")) implementation(project(":utils")) diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index a0e719caa..1b3662534 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -38,13 +38,13 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -62,6 +62,10 @@ android { } } +kotlin { + jvmToolchain(21) +} + dependencies { coreLibraryDesugaring(libs.desugarJdkLibsNio) diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts index e0eead33d..6773080cd 100644 --- a/utils/build.gradle.kts +++ b/utils/build.gradle.kts @@ -38,13 +38,13 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = JvmTarget.JVM_17 freeCompilerArgs.addAll( "-jvm-default=enable" ) @@ -62,6 +62,10 @@ android { } } +kotlin { + jvmToolchain(21) +} + dependencies { coreLibraryDesugaring(libs.desugarJdkLibsNio)