From 8c26af7d401831ddf4ef06f4915041170290ee9f Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 28 Aug 2025 21:06:08 +0100 Subject: [PATCH 1/3] upgrade agp to 8.12.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e8587df7..ec26da936 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] accompanistAdaptive = "0.37.3" activityCompose = "1.10.1" -agp = "8.12.1" +agp = "8.12.2" android-compileSdk = "36" android-minSdk = "26" android-targetSdk = "36" From ef250eb0f196dd368a2c1f57cf615b8daaa04c24 Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 28 Aug 2025 22:14:16 +0100 Subject: [PATCH 2/3] Consistent JvmTarget JVM_21 across all modules --- quartz/build.gradle.kts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts index 500a818ef..8ce268192 100644 --- a/quartz/build.gradle.kts +++ b/quartz/build.gradle.kts @@ -4,7 +4,11 @@ plugins { } kotlin { - jvm() + jvm { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 + } + } // Target declarations - add or remove as needed below. These define // which platforms this KMP module supports. @@ -35,6 +39,7 @@ kotlin { } compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 freeCompilerArgs.add("-Xstring-concat=inline") } } From dbcca9cbd22b40e30e2a50d16ddec7aa91c73beb Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 28 Aug 2025 22:48:18 +0100 Subject: [PATCH 3/3] Use JvmTarget JVM_1_8 for quartz to be more forgiving about requirements. --- quartz/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts index 8ce268192..4ea88c16e 100644 --- a/quartz/build.gradle.kts +++ b/quartz/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin { jvm { compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 } } @@ -39,7 +39,7 @@ kotlin { } compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 freeCompilerArgs.add("-Xstring-concat=inline") } }