Merge remote-tracking branch 'origin/develop' into fb_embedded_testFixes

LabKey · Jan 5, 2024 · 9da22ca · 9da22ca
2 parents af6bbb4 + 2cab7ff
commit 9da22ca
Show file tree

Hide file tree

Showing 13 changed files with 243 additions and 1,747 deletions.
diff --git a/build.gradle b/build.gradle
@@ -101,7 +101,7 @@ if (project.findProject(":remoteapi:labkey-api-jdbc") != null)
 
 if (project.hasProperty("teamcity"))
 {
-    apply plugin: 'org.labkey.teamCity'
+    apply plugin: 'org.labkey.build.teamCity'
 }
 
 // If this configuration for the default jar file is included when syncing with IntelliJ

diff --git a/buildTestModules/communityArtifacts/build.gradle b/buildTestModules/communityArtifacts/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'org.labkey.module'
+apply plugin: 'org.labkey.build.module'
 
 dependencies { 
     // add dependencies on community modules, not including those that come through from transitive dependencies:

diff --git a/buildTestModules/starterArtifacts/build.gradle b/buildTestModules/starterArtifacts/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'org.labkey.module'
+apply plugin: 'org.labkey.build.module'
 
 dependencies { 
     // add dependencies on starter modules, not including those that come through from transitive dependencies:

diff --git a/distributions/teamcity/build.gradle b/distributions/teamcity/build.gradle
@@ -62,9 +62,9 @@ else
             if (otherProject != project && ModuleFinder.isPotentialModule(otherProject) && FileModule.shouldDoBuild(otherProject, false))
             {
                 project.evaluationDependsOn(otherProject.path)
-                if (otherProject.plugins.hasPlugin('org.labkey.module') ||
-                    otherProject.plugins.hasPlugin('org.labkey.fileModule') ||
-                    otherProject.plugins.hasPlugin('org.labkey.javaModule'))
+                if (otherProject.plugins.hasPlugin('org.labkey.build.module') ||
+                    otherProject.plugins.hasPlugin('org.labkey.build.fileModule') ||
+                    otherProject.plugins.hasPlugin('org.labkey.build.javaModule'))
                     pathList += otherProject.path
             }
     }

diff --git a/modules/build.gradle b/modules/build.gradle
@@ -3,9 +3,9 @@ subprojects { Project p ->
     if (p.getProjectDir().exists())
     {
         if (p.file("src").exists())
-            apply plugin: 'org.labkey.module'
+            apply plugin: 'org.labkey.build.module'
         else
-            apply plugin: 'org.labkey.fileModule'
+            apply plugin: 'org.labkey.build.fileModule'
     }
 }