From 70ba8a54c794f8fe712ab20cc492b933863d39b7 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Thu, 21 Dec 2023 11:30:48 +0530 Subject: [PATCH] fix: disable core library desugaring for logsender (#1564) --- .../androidide/plugins/conf/AndroidModuleConf.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt index 8ec420a7d..41a7ab01e 100644 --- a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt +++ b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt @@ -25,6 +25,7 @@ import org.gradle.api.artifacts.VersionCatalogsExtension import projectVersionCode private val flavorsAbis = arrayOf("arm64-v8a", "armeabi-v7a", "x86_64") +private val disableCoreLibDesugaringForModules = arrayOf(":logsender", ":logger") fun Project.configureAndroidModule( coreLibDesugDep: Dependency @@ -52,10 +53,10 @@ fun Project.configureAndroidModule( compileOptions { sourceCompatibility = BuildConfig.javaVersion targetCompatibility = BuildConfig.javaVersion - - isCoreLibraryDesugaringEnabled = true } + configureCoreLibDesugaring(this, coreLibDesugDep) + if (":app" == project.path) { flavorDimensions("default") @@ -108,7 +109,15 @@ fun Project.configureAndroidModule( buildFeatures.viewBinding = true buildFeatures.buildConfig = true + } +} +private fun Project.configureCoreLibDesugaring(baseExtension: BaseExtension, coreLibDesugDep: Dependency) { + val coreLibDesugaringEnabled = project.path !in disableCoreLibDesugaringForModules + + baseExtension.compileOptions.isCoreLibraryDesugaringEnabled = coreLibDesugaringEnabled + + if (coreLibDesugaringEnabled) { configurations.getByName("coreLibraryDesugaring").apply { dependencies.add(coreLibDesugDep) }