From a530f7248230775132b3b3db37b36aeee29bcebf Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 13 Nov 2023 15:45:16 -0800 Subject: [PATCH] excludedModulePaths -> excludedModules --- gradle/settings/all.gradle | 4 ++-- gradle/settings/distributions.gradle | 4 ++-- gradle/settings/ehr.gradle | 4 ++-- settings.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/settings/all.gradle b/gradle/settings/all.gradle index 55bbf76da8..1f9224b904 100644 --- 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 index 7398ec41e2..ffdbf1b531 100644 --- 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 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 index c2bb25c977..dc338cc226 100644 --- a/gradle/settings/ehr.gradle +++ b/gradle/settings/ehr.gradle @@ -58,8 +58,8 @@ List ehrModulesDirs = [ ] List 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 index 4f49a7881d..14f225cc82 100644 --- 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 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()