From 14f76fb9b0e5d8c142ac7cb04ec3e7085172ec88 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Mon, 25 Dec 2023 15:42:49 +0530 Subject: [PATCH] build: append flavor name to version names --- .../com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt | 5 +++-- 1 file changed, 3 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 08b85b88f..923a4e28d 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 @@ -21,7 +21,6 @@ import BuildConfig import com.android.build.gradle.BaseExtension import org.gradle.api.Project import org.gradle.api.artifacts.Dependency -import org.gradle.api.artifacts.VersionCatalogsExtension import projectVersionCode private val flavorsAbis = arrayOf("arm64-v8a", "armeabi-v7a", "x86_64") @@ -65,6 +64,7 @@ fun Project.configureAndroidModule( forEach { val name = it.name + it.versionNameSuffix = "-$name" defaultConfig.buildConfigField("String", "FLAVOR_${name.replace('-', '_').uppercase()}", "\"${name}\"") @@ -116,7 +116,8 @@ fun Project.configureAndroidModule( } } -private fun Project.configureCoreLibDesugaring(baseExtension: BaseExtension, coreLibDesugDep: Dependency) { +private fun Project.configureCoreLibDesugaring(baseExtension: BaseExtension, + coreLibDesugDep: Dependency) { val coreLibDesugaringEnabled = project.path !in disableCoreLibDesugaringForModules baseExtension.compileOptions.isCoreLibraryDesugaringEnabled = coreLibDesugaringEnabled