From cd9b4b9dfe6f218fa50b8e973053cb871617cbed Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 31 May 2024 15:59:34 +0900 Subject: [PATCH] Remove desugaring. Change-Id: I3738783395899cb1b96d09db2d97de36c530d5b7 --- .../com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 6 ------ gradle/libs.versions.toml | 2 -- 2 files changed, 8 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index bfb799595..2ecb47cba 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -22,7 +22,6 @@ import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginExtension import org.gradle.kotlin.dsl.assign import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.provideDelegate import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension @@ -47,15 +46,10 @@ internal fun Project.configureKotlinAndroid( // https://developer.android.com/studio/write/java11-minimal-support-table sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 - isCoreLibraryDesugaringEnabled = true } } configureKotlin() - - dependencies { - add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get()) - } } /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e0b938e75..b11aa6c90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] accompanist = "0.34.0" -androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together androidGradlePlugin = "8.4.0" androidTools = "31.4.0" @@ -63,7 +62,6 @@ turbine = "1.1.0" [libraries] accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" } -android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }