Skip to content

Update moduleSet gradle settings files #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Oct 6, 2025
Merged

Update moduleSet gradle settings files #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions gradle/settings/all.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,13 @@ if (hasProperty('gradleExcludeModuleDirs'))
if (hasProperty('excludedModules'))
exclusions.addAll("${excludedModules}".split(","))

// Include ':server:embedded' unless explicitly excluded
if (!exclusions.contains("embedded"))
{
include BuildUtils.getEmbeddedProjectPath(gradle)
}

BuildUtils.includeModules(this.settings, rootDir, ["server/modules"], exclusions, true)

// include the test distribution, which is used to create an artifact for TeamCity to pass around to the agents
include "${BuildUtils.getTestProjectPath(this.settings.gradle)}:distributions:teamcity"
if (new File(getRootDir(), BuildUtils.convertPathToRelativeDir(BuildUtils.getTestProjectPath(gradle))).exists())
{
// include the test distribution, which is used to create an artifact for TeamCity to pass around to the agents
include "${BuildUtils.getTestProjectPath(this.settings.gradle)}:distributions:teamcity"
}

if (new File(getRootDir(), BuildUtils.convertPathToRelativeDir(BuildUtils.getJdbcApiProjectPath(gradle))).exists())
{
Expand Down
17 changes: 11 additions & 6 deletions gradle/settings/ehr.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,15 @@ if (hasProperty('excludedModules'))
BuildUtils.includeModules(this.settings, rootDir, [BuildUtils.PLATFORM_MODULES_DIR, BuildUtils.COMMON_ASSAYS_MODULES_DIR], excludedModules)
BuildUtils.includeModules(this.settings, rootDir, ehrModulesDirs, excludedModules)

include ":server:modules:snd"
include ":server:modules:premiumModules:dataintegration"
include ":server:modules:premiumModules:premium"
include ":server:modules:premiumModules:ldap"
if (new File(getRootDir(), BuildUtils.convertPathToRelativeDir(":server:modules:premiumModules")).exists())
{
include ":server:modules:premiumModules:dataintegration"
Copy link
Contributor

@labkey-susanh labkey-susanh Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've left out SND. Is that intentional?

Copy link
Member Author

@labkey-tchad labkey-tchad Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, SND lives in the ehrModules repository now so it doesn't need special handling.

include ":server:modules:premiumModules:premium"
include ":server:modules:premiumModules:ldap"
}

// include the test distribution, which is used to create an artifact for TeamCity to pass around to the agents
include "${BuildUtils.getTestProjectPath(this.settings.gradle)}:distributions:teamcity"
if (new File(getRootDir(), BuildUtils.convertPathToRelativeDir(BuildUtils.getTestProjectPath(gradle))).exists())
{
// include the test distribution, which is used to create an artifact for TeamCity to pass around to the agents
include "${BuildUtils.getTestProjectPath(this.settings.gradle)}:distributions:teamcity"
}
10 changes: 5 additions & 5 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ else
// The line below includes all modules in the server/modules, server/modules/platform, server/modules/commonAssays, and server/modules/customModules directories
//BuildUtils.includeModules(this.settings, rootDir, BuildUtils.SERVER_MODULE_DIRS, excludedModules)

// The line below includes a set of individual modules (in this case, some EHR related modules)
//BuildUtils.includeModules(this.settings, [":server:modules:tnprc_ehr",
// ":server:modules:tnprc_billing",
// ":server:modules:snd"])
// The line below includes a set of individual modules (in this case, some assay modules)
//BuildUtils.includeModules(this.settings, [":server:modules:commonAssays:elisa",
// ":server:modules:commonAssays:flow",
// ":server:modules:commonAssays:ms2"])

// The line below is an example of how to include a single module
//include ":server:modules:workflow"
//include ":server:modules:commonAssays:ms2"
}

if (hasProperty('extraIncludes'))
Expand Down