From bd22e7b134e8b792b7e4b046a9376f13e463af3f Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Tue, 26 Sep 2023 07:59:06 +0800 Subject: [PATCH] refactor: remove related lowercase functions --- .../dsl/configure/SweetPropertyConfigureExtension.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/extension/dsl/configure/SweetPropertyConfigureExtension.kt b/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/extension/dsl/configure/SweetPropertyConfigureExtension.kt index 69f345d..d05dd74 100644 --- a/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/extension/dsl/configure/SweetPropertyConfigureExtension.kt +++ b/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/extension/dsl/configure/SweetPropertyConfigureExtension.kt @@ -92,7 +92,7 @@ open class SweetPropertyConfigureExtension internal constructor() { * 配置根项目 * @param action 配置方法体 */ - fun rootProject(action: Action) = configureProject(ROOT_PROJECT_TAG, action, isLowercase = false) + fun rootProject(action: Action) = configureProject(ROOT_PROJECT_TAG, action) /** * 配置指定项目 @@ -105,10 +105,9 @@ open class SweetPropertyConfigureExtension internal constructor() { * 配置项目 * @param name 项目完整名称 * @param action 配置方法体 - * @param isLowercase 是否转换 [name] 为小写 - 默认是 */ - private fun configureProject(name: String, action: Action, isLowercase: Boolean = true) = - action.execute(SubConfigureExtension().also { projectConfigures[if (isLowercase) name.lowercase() else name] = it }) + private fun configureProject(name: String, action: Action) = + action.execute(SubConfigureExtension().also { projectConfigures[name] = it }) /** * 子配置方法体实现类 @@ -502,10 +501,10 @@ open class SweetPropertyConfigureExtension internal constructor() { val currentGlobal = globalConfigure.create() val currentProjects = mutableMapOf() val rootName = settings.rootProject.name - if (projectConfigures.containsKey(rootName.lowercase())) + if (projectConfigures.any { (name, _) -> name.lowercase() == rootName.lowercase() }) SError.make("This name \"$rootName\" is a root project, please use rootProject function to configure it, not project(\"$rootName\")") if (projectConfigures.containsKey(ROOT_PROJECT_TAG)) { - projectConfigures[rootName.lowercase()] = projectConfigures[ROOT_PROJECT_TAG] ?: SError.make("Internal error") + projectConfigures[rootName] = projectConfigures[ROOT_PROJECT_TAG] ?: SError.make("Internal error") projectConfigures.remove(ROOT_PROJECT_TAG) } projectConfigures.forEach { (name, subConfigure) ->