From a6e0dd0d3aff663bec6ffe9088a2000da35f53d8 Mon Sep 17 00:00:00 2001 From: Juul Mobile Bot Date: Fri, 28 Jul 2023 09:08:37 +0000 Subject: [PATCH 1/3] Update agp to v8.1.0 --- 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 ee7f615..65f5c56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.0.2" +agp = "8.1.0" android-compile = "android-30" android-min = "21" jvm-toolchain = "11" From 7ab8571f38a21b746321d99907eb08974ae4fed9 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Fri, 28 Jul 2023 10:09:23 -0700 Subject: [PATCH 2/3] Drop JVM toolchain workaround --- runtime/build.gradle.kts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index e47cb06..5858a18 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -15,13 +15,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_11 - targetCompatibility = JavaVersion.VERSION_11 - } - compileSdkVersion(libs.versions.android.compile.get()) defaultConfig { From 6f4a6ac7f5cce141d8b22241264131b2e5be82aa Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Fri, 28 Jul 2023 10:09:42 -0700 Subject: [PATCH 3/3] Replace usages of deprecated AGP DSL --- gradle/libs.versions.toml | 2 +- runtime/build.gradle.kts | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65f5c56..756fd99 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.1.0" -android-compile = "android-30" +android-compile = "30" android-min = "21" jvm-toolchain = "11" kotlin = "1.9.0" diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index 5858a18..5a97a5b 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -15,12 +15,8 @@ kotlin { } android { - compileSdkVersion(libs.versions.android.compile.get()) - - defaultConfig { - minSdkVersion(libs.versions.android.min.get()) - } - + compileSdk = libs.versions.android.compile.get().toInt() + defaultConfig.minSdk = libs.versions.android.min.get().toInt() namespace = "com.juul.exercise.runtime" }