From 64fc62a0d00cfe19873bc65b6531237375f5eea5 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Mon, 23 Sep 2024 14:03:33 -0700 Subject: [PATCH] Bump JVM toolchain to `11` (#403) --- coroutines/build.gradle.kts | 7 ------- gradle/libs.versions.toml | 2 +- temporal/build.gradle.kts | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts index e8bc7f17..cc5fc26b 100644 --- a/coroutines/build.gradle.kts +++ b/coroutines/build.gradle.kts @@ -95,13 +95,6 @@ kotlin { } android { - // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09. - // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - compileSdk = libs.versions.android.compile.get().toInt() defaultConfig.minSdk = 16 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d84a98d5..b599ca77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ android-compile = "34" coroutines = "1.9.0" jacoco = "0.8.7" -jvm-toolchain = "8" +jvm-toolchain = "11" kotlin = "2.0.20" ktor = "2.3.12" diff --git a/temporal/build.gradle.kts b/temporal/build.gradle.kts index debf1435..c03d2f48 100644 --- a/temporal/build.gradle.kts +++ b/temporal/build.gradle.kts @@ -73,13 +73,6 @@ kotlin { } android { - // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09. - // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - compileSdk = libs.versions.android.compile.get().toInt() defaultConfig.minSdk = 16