HighCapable/SweetProperty
5
0
Fork 0
mirror of https://github.com/HighCapable/SweetProperty.git synced 2025-09-05 10:15:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove related lowercase functions

Browse Source
This commit is contained in:
fankesyooni
2023-09-26 07:59:06 +08:00
parent 416522a673
commit bd22e7b134
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/extension/dsl/configure/SweetPropertyConfigureExtension.kt
View File

@@ -92,7 +92,7 @@ open class SweetPropertyConfigureExtension internal constructor() {
* 配置根项目 * 配置根项目
* @param action 配置方法体 * @param action 配置方法体
*/ */
fun rootProject(action: Action<SubConfigureExtension>) = configureProject(ROOT_PROJECT_TAG, action, isLowercase = false) fun rootProject(action: Action<SubConfigureExtension>) = configureProject(ROOT_PROJECT_TAG, action)
/** /**
* 配置指定项目 * 配置指定项目
@@ -105,10 +105,9 @@ open class SweetPropertyConfigureExtension internal constructor() {
* 配置项目 * 配置项目
* @param name 项目完整名称 * @param name 项目完整名称
* @param action 配置方法体 * @param action 配置方法体
* @param isLowercase 是否转换 [name] 为小写 - 默认是
*/ */
private fun configureProject(name: String, action: Action<SubConfigureExtension>, isLowercase: Boolean = true) = private fun configureProject(name: String, action: Action<SubConfigureExtension>) =
action.execute(SubConfigureExtension().also { projectConfigures[if (isLowercase) name.lowercase() else name] = it }) action.execute(SubConfigureExtension().also { projectConfigures[name] = it })
/** /**
* 子配置方法体实现类 * 子配置方法体实现类
@@ -502,10 +501,10 @@ open class SweetPropertyConfigureExtension internal constructor() {
val currentGlobal = globalConfigure.create() val currentGlobal = globalConfigure.create()
val currentProjects = mutableMapOf<String, ISweetPropertyConfigs.ISubConfigs>() val currentProjects = mutableMapOf<String, ISweetPropertyConfigs.ISubConfigs>()
val rootName = settings.rootProject.name 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\")") 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)) { 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.remove(ROOT_PROJECT_TAG)
} }
projectConfigures.forEach { (name, subConfigure) -> projectConfigures.forEach { (name, subConfigure) ->