excludedModulePaths -> excludedModules

LabKey · Nov 13, 2023 · a530f72 · a530f72
1 parent 1ac4289
commit a530f72
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/gradle/settings/all.gradle b/gradle/settings/all.gradle
@@ -55,8 +55,8 @@ if (hasProperty('gradleExcludeModuleDirs'))
 {
     excludedDirs.addAll("${gradleExcludeModuleDirs}".toLowerCase().split(","))
 }
-if (hasProperty('excludedModulePaths'))
-    exclusions.addAll("${excludedModulePaths}".split(","))
+if (hasProperty('excludedModules'))
+    exclusions.addAll("${excludedModules}".split(","))
 
 // Include ':server:embedded' unless explicitly excluded
 if (!exclusions.contains("embedded"))

diff --git a/gradle/settings/distributions.gradle b/gradle/settings/distributions.gradle
@@ -45,7 +45,7 @@ import org.labkey.gradle.util.BuildUtils
 apply from: 'all.gradle'
 
 List<String> excludedModules = []
-if (hasProperty('excludedModulePaths'))
-    excludedModules.addAll("${excludedModulePaths}".split(","))
+if (hasProperty('excludedModules'))
+    excludedModules.addAll("${excludedModules}".split(","))
 
 BuildUtils.includeModules(this.settings, rootDir, ["distributions"], excludedModules)
diff --git a/gradle/settings/ehr.gradle b/gradle/settings/ehr.gradle
@@ -58,8 +58,8 @@ List<String> ehrModulesDirs = [
 ]
 
 List<String> excludedModules = []
-if (hasProperty('excludedModulePaths'))
-    excludedModules.addAll("${excludedModulePaths}".split(","))
+if (hasProperty('excludedModules'))
+    excludedModules.addAll("${excludedModules}".split(","))
 
 
 BuildUtils.includeModules(this.settings, rootDir, [BuildUtils.PLATFORM_MODULES_DIR, BuildUtils.COMMON_ASSAYS_MODULES_DIR], excludedModules)

diff --git a/settings.gradle b/settings.gradle
@@ -107,9 +107,9 @@ include BuildUtils.getMinificationProjectPath(gradle)
 // Items may be individual module names (e.g. 'luminex'), module container names (e.g. 'customModules'), or paths (e.g., ':server:modules:commonAssays:flow')
 // You must make sure to pass this list to the appropriate calls to `BuildUtils.includeModules`
 List<String> excludedModules = []
-if (hasProperty('excludedModulePaths'))
+if (hasProperty('excludedModules'))
 {
-    excludedModules.addAll("${excludedModulePaths}".split(","))
+    excludedModules.addAll("${excludedModules}".split(","))
 }
 
 if (new File(getRootDir(), BuildUtils.convertPathToRelativeDir(BuildUtils.getPlatformProjectPath(gradle))).exists()