Skip to content
This repository was archived by the owner on May 11, 2026. It is now read-only.

Commit 2e29807

Browse files
committed
refactor: standardize Gradle project naming
1 parent 87928e9 commit 2e29807

3 files changed

Lines changed: 25 additions & 24 deletions

File tree

sweetdependency-gradle-plugin/src/main/java/com/highcapable/sweetdependency/gradle/factory/GradleProjectFactory.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ import org.gradle.plugin.use.PluginDependency
4949

5050
/**
5151
* 获取指定项目的完整名称
52+
* @param isUseColon 是否在子项目前使用冒号 - 默认是
5253
* @return [String]
5354
*/
54-
internal val Project.fullName
55-
get(): String {
56-
val baseNames = mutableListOf<String>()
55+
internal fun Project.fullName(isUseColon: Boolean = true): String {
56+
val isRoot = this == rootProject
57+
val baseNames = mutableListOf<String>()
5758

58-
/**
59-
* 递归子项目
60-
* @param project 当前项目
61-
*/
62-
fun fetchChild(project: Project) {
63-
project.parent?.also { if (it != it.rootProject) fetchChild(it) }
64-
baseNames.add(project.name)
65-
}
66-
fetchChild(project = this)
67-
return buildString { baseNames.onEach { append(":$it") }.clear() }.drop(1)
68-
}
59+
/**
60+
* 递归子项目
61+
* @param project 当前项目
62+
*/
63+
fun fetchChild(project: Project) {
64+
project.parent?.also { if (it != it.rootProject) fetchChild(it) }
65+
baseNames.add(project.name)
66+
}; fetchChild(project = this)
67+
return buildString { baseNames.onEach { append(":$it") }.clear() }.let { if (isUseColon && isRoot.not()) it else it.drop(1) }
68+
}
6969

7070
/**
7171
* 向构建脚本添加自定义依赖

sweetdependency-gradle-plugin/src/main/java/com/highcapable/sweetdependency/manager/transaction/DependencyMigrationTemplateTransaction.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ internal object DependencyMigrationTemplateTransaction {
7575
internal fun createTemplate() {
7676
SLog.info("Starting analyze projects dependencies structure", SLog.ANLZE)
7777
GradleHelper.allProjects.forEach { subProject ->
78+
val projectName = subProject.fullName()
7879
subProject.plugins().onEach {
7980
if (exclusionPluginPrefixs.any { prefix -> it.id.startsWith(prefix) }) return@onEach
8081
if (Dependencies.hasPlugin { key, _ -> key.current == it.id }) return@onEach
8182
if (document.plugins == null) document.plugins = mutableMapOf()
8283
val declareDocument = DependencyDocument(version = DependencyVersion.AUTOWIRE_VERSION_NAME)
8384
document.plugins?.set(it.id, declareDocument)
84-
}.apply { if (isNotEmpty()) SLog.info("Found $size plugins in project \"${subProject.fullName}\"", SLog.LINK) }
85+
}.apply { if (isNotEmpty()) SLog.info("Found $size plugins in project \"$projectName\"", SLog.LINK) }
8586
subProject.libraries().onEach {
8687
if (Dependencies.hasLibrary { key, _ -> key.current == it.toString() }) return@onEach
8788
if (document.libraries == null) document.libraries = mutableMapOf()
@@ -90,7 +91,7 @@ internal object DependencyMigrationTemplateTransaction {
9091
val declareDocument = DependencyDocument(version = it.version.existed)
9192
entities[it.groupId]?.set(it.artifactId, declareDocument)
9293
}
93-
}.apply { if (isNotEmpty()) SLog.info("Found $size libraries in project \"${subProject.fullName}\"", SLog.LINK) }
94+
}.apply { if (isNotEmpty()) SLog.info("Found $size libraries in project \"$projectName\"", SLog.LINK) }
9495
}; saveTemplateFile()
9596
}
9697

sweetdependency-gradle-plugin/src/main/java/com/highcapable/sweetdependency/manager/transaction/RuntimeDebugTransaction.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,24 +152,24 @@ internal object RuntimeDebugTransaction {
152152
if (vfExclusionList.isNotEmpty()) versionFilterMap["exclusionList"] = mutableMapOf<String, Any>()
153153
vfExclusionList.forEach { versionFilterMap["exclusionList"]?.addAsMap(it) }
154154
GradleHelper.allProjects.forEach { subProject ->
155-
projectPluginsMap[subProject.fullName] = mutableMapOf<String, Any>()
156-
projectLibrariesMap[subProject.fullName] = mutableMapOf<String, Any>()
157-
subProject.plugins().forEach { projectPluginsMap[subProject.fullName]?.addAsMap(it.id) }
155+
projectPluginsMap[subProject.fullName()] = mutableMapOf<String, Any>()
156+
projectLibrariesMap[subProject.fullName()] = mutableMapOf<String, Any>()
157+
subProject.plugins().forEach { projectPluginsMap[subProject.fullName()]?.addAsMap(it.id) }
158158
subProject.libraries().forEach {
159159
val prefix = "(${it.configurationName})"
160160
when (it.type) {
161161
LibraryDependencyType.EXTERNAL, LibraryDependencyType.EXTERNAL_DELEGATE -> {
162162
val suffix = it.version.deployed.noBlank()?.let { e -> ":$e" } ?: ""
163-
projectLibrariesMap[subProject.fullName]?.addAsMap("$prefix ${it.groupId}:${it.artifactId}$suffix")
163+
projectLibrariesMap[subProject.fullName()]?.addAsMap("$prefix ${it.groupId}:${it.artifactId}$suffix")
164164
}
165-
LibraryDependencyType.PROJECT -> projectLibrariesMap[subProject.fullName]?.addAsMap("$prefix (project) ${it.project?.fullName}")
165+
LibraryDependencyType.PROJECT -> projectLibrariesMap[subProject.fullName()]?.addAsMap("$prefix (project) ${it.project?.fullName()}")
166166
LibraryDependencyType.FILES -> {
167167
val filesMap = mutableMapOf<String, String>()
168168
it.files?.noEmpty()?.forEach { e -> filesMap.addAsMap(e.absolutePath) }?.also {
169-
projectLibrariesMap[subProject.fullName] = mapOf("$prefix (files)" to filesMap)
170-
} ?: projectLibrariesMap[subProject.fullName]?.addAsMap("$prefix (files) not found or empty folder")
169+
projectLibrariesMap[subProject.fullName()] = mapOf("$prefix (files)" to filesMap)
170+
} ?: projectLibrariesMap[subProject.fullName()]?.addAsMap("$prefix (files) not found or empty folder")
171171
}
172-
LibraryDependencyType.OTHERS -> projectLibrariesMap[subProject.fullName]?.addAsMap("$prefix unknown type dependency")
172+
LibraryDependencyType.OTHERS -> projectLibrariesMap[subProject.fullName()]?.addAsMap("$prefix unknown type dependency")
173173
}
174174
}
175175
}

0 commit comments

Comments
 (0)