Improved: Rewrite ‘installAllPlugins’ in build script (OFBIZ-10695)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854591 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 1, 2019 · f712b189bbc1882cdeed88feb7c0c372d7c1ebc0 · f712b18
1 parent f1a1431
commit f712b189bbc1882cdeed88feb7c0c372d7c1ebc0
Showing with 9 additions and 12 deletions.

+7 −12 build.gradle

+2 −0 common.gradle
diff --git a/build.gradle b/build.gradle
@@ -906,18 +906,13 @@ task pullAllPluginsSource(group: ofbizPlugin,
     dependsOn pullPluginsFromSvn
 
     task installAllPlugins {
-        file("${pluginsDir}").eachDir { plugin ->
-            activeComponents().each { component ->
-                if (component.name == plugin.name) {
-                    if (subprojectExists(":plugins:${plugin.name}")) {
-                        if (taskExistsInproject(":plugins:${plugin.name}", 'install')) {
-                            dependsOn ":plugins:${plugin.name}:install"
-                            doLast { println "installed plugin ${plugin.name}" }
-                        }
-                    }
-                }
-            }
-        }
+        subdirs(file("${pluginsDir}"))
+            .filter(this.isComponentEnabled)
+            .filter { taskExistsInproject(":plugins:${it.name}", 'install') }
+            .forEach({ plugin ->
+                dependsOn ":plugins:${plugin.name}:install"
+                doLast { println "installed plugin ${plugin.name}" }
+            })
     }
     doLast {
         gradlewSubprocess(['installAllPlugins'])

diff --git a/common.gradle b/common.gradle
@@ -54,5 +54,7 @@ List<File> activeComponents() {
 }
 
 ext {
+    subdirs = this.&subdirs
     activeComponents = this.&activeComponents.memoize()
+    isComponentEnabled = this.&isComponentEnabled.memoize()
 }