fix(bom): bom组件项目不使用ihub-bom插件 (#367)

ihub-pub · Feb 5, 2023 · ddc7a96 · ddc7a96
1 parent 336d6ec
commit ddc7a96
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ihub-bom/src/main/groovy/pub/ihub/plugin/bom/IHubBomPlugin.groovy b/ihub-bom/src/main/groovy/pub/ihub/plugin/bom/IHubBomPlugin.groovy
@@ -33,6 +33,11 @@ class IHubBomPlugin extends IHubProjectPluginAware<IHubBomExtension> {
 
     @Override
     void apply() {
+        // 如果项目为bom组件项目时，不执行插件
+        if (project.name == extension.findProjectProperty('iHubSettings.includeBom')) {
+            return
+        }
+
         // 配置ihub-bom
         extension.importBoms {
             group 'pub.ihub.lib' module 'ihub-libs' version IHubLibsVersion.version
@@ -54,10 +59,6 @@ class IHubBomPlugin extends IHubProjectPluginAware<IHubBomExtension> {
                 ext.printConfigContent()
             }
         }
-
-        project.subprojects {
-            pluginManager.apply IHubBomPlugin
-        }
     }
 
     private void configVersions(IHubBomExtension ext) {

diff --git a/ihub-bom/src/test/groovy/pub/ihub/plugin/bom/IHubBomPluginTest.groovy b/ihub-bom/src/test/groovy/pub/ihub/plugin/bom/IHubBomPluginTest.groovy
@@ -126,10 +126,11 @@ class IHubBomPluginTest extends IHubSpecification {
         '''
 
         when: '添加子项目'
-        testProjectDir.newFile(DEFAULT_SETTINGS_FILE) << 'include \'a\', \'b\', \'c\''
+        testProjectDir.newFile(DEFAULT_SETTINGS_FILE) << 'include \'a\', \'b\', \'c\', \'demo-bom\''
         testProjectDir.newFolder 'a'
         testProjectDir.newFolder 'b'
         testProjectDir.newFolder 'c'
+        propertiesFile << 'iHubSettings.includeBom=demo-bom\n'
         buildFile << '''
             allprojects {
                 iHubBom {

diff --git a/ihub-plugins/src/main/groovy/pub/ihub/plugin/IHubPluginsPlugin.groovy b/ihub-plugins/src/main/groovy/pub/ihub/plugin/IHubPluginsPlugin.groovy
@@ -60,9 +60,11 @@ class IHubPluginsPlugin extends IHubProjectPluginAware<IHubPluginsExtension> {
                     checkForGradleUpdate = true
                 }
             }
-            if (!hasPlugin(JavaPlatformPlugin)) {
-                applyPlugin IHubBomPlugin
-            }
+        }
+
+        // 非Java平台组件项目默认应用IHubBom插件
+        if (!hasPlugin(JavaPlatformPlugin)) {
+            applyPlugin IHubBomPlugin
         }
 
         project.subprojects {