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

refactor: using new way to checking load build script class exists

Browse Source
This commit is contained in:
fankesyooni
2023-09-06 19:33:10 +08:00
parent 8cc09e7fcd
commit 8594bca9a6
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/gradle/factory/GradleProjectFactory.kt
View File

@@ -67,4 +67,4 @@ internal fun Project.addDependencyToBuildScript(repositoryPath: String, pomData:
* @param name [Class] 完整名称 * @param name [Class] 完整名称
* @return [Class] * @return [Class]
*/ */
internal fun Project.loadBuildScriptClass(name: String) = buildscript.classLoader.loadClass(name) internal fun Project.loadBuildScriptClass(name: String) = runCatching { buildscript.classLoader.loadClass(name) }.getOrNull()

18
sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/helper/PropertiesDeployHelper.kt
View File

@@ -156,7 +156,10 @@ internal object PropertiesDeployHelper {
allProperties.add(generatedProperties(subConfigs.buildScript, ProjectDescriptor.create(settings, name))) allProperties.add(generatedProperties(subConfigs.buildScript, ProjectDescriptor.create(settings, name)))
allConfigs.add(subConfigs.buildScript) allConfigs.add(subConfigs.buildScript)
} }
if (isConfigsModified.not() && allProperties == cachedSettingsProperties && accessorsDir.isEmpty().not()) return if (isConfigsModified.not() &&
allProperties == cachedSettingsProperties &&
accessorsDir.resolve(accessorsPomData.relativePomPath).isEmpty().not()
) return
cachedSettingsProperties = allProperties cachedSettingsProperties = allProperties
accessorsGenerator.build(allConfigs, allProperties).compile(accessorsPomData, accessorsDir.absolutePath, accessorsGenerator.compileStubFiles) accessorsGenerator.build(allConfigs, allProperties).compile(accessorsPomData, accessorsDir.absolutePath, accessorsGenerator.compileStubFiles)
} }
@@ -166,7 +169,8 @@ internal object PropertiesDeployHelper {
* @param rootProject 当前根项目 * @param rootProject 当前根项目
*/ */
private fun resolveAccessors(rootProject: Project) { private fun resolveAccessors(rootProject: Project) {
if (accessorsDir.isEmpty().not()) rootProject.addDependencyToBuildScript(accessorsDir.absolutePath, accessorsPomData) if (accessorsDir.resolve(accessorsPomData.relativePomPath).isEmpty().not())
rootProject.addDependencyToBuildScript(accessorsDir.absolutePath, accessorsPomData)
} }
/** /**
@@ -178,7 +182,15 @@ internal object PropertiesDeployHelper {
fun Project.deploy() { fun Project.deploy() {
val configs = configs.with(this).buildScript val configs = configs.with(this).buildScript
if (configs.isEnable.not()) return if (configs.isEnable.not()) return
getOrCreate(configs.extensionName.camelcase(), loadBuildScriptClass(accessorsGenerator.propertiesClass(configs.name))) val className = accessorsGenerator.propertiesClass(configs.name)
val accessorsClass = loadBuildScriptClass(className) ?: SError.make(
"""
Generated class "$className" not found, stop loading $this
Please check whether the initialization process is interrupted and re-run Gradle Sync
If this doesn't work, please manually delete the entire "${accessorsDir.absolutePath}" directory
""".trimIndent()
)
getOrCreate(configs.extensionName.camelcase(), accessorsClass)
} }
rootProject.deploy() rootProject.deploy()
rootProject.subprojects.forEach { it.deploy() } rootProject.subprojects.forEach { it.deploy() }