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

labkey-matthewb · labkey-matthewb · commit 8a36a59bf580 · 2020-05-13T12:36:02.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,9 @@ subprojects.each  {
     {
         p.evaluationDependsOn(BuildUtils.getApiProjectPath(project.gradle))
         p.apply plugin: 'java'
-        p.apply plugin: 'org.labkey.module'
+        if (p.file('src').exists())
+            p.apply plugin: 'org.labkey.module'
+        else
+            p.apply plugin: 'org.labkey.fileModule'
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ subprojects.each {`
`6`	`6`	`{`
`7`	`7`	`p.evaluationDependsOn(BuildUtils.getApiProjectPath(project.gradle))`
`8`	`8`	`p.apply plugin: 'java'`
`9`		`- p.apply plugin: 'org.labkey.module'`
	`9`	`+ if (p.file('src').exists())`
	`10`	`+ p.apply plugin: 'org.labkey.module'`
	`11`	`+ else`
	`12`	`+ p.apply plugin: 'org.labkey.fileModule'`
`10`	`13`	`}`
`11`	`14`	`}`