Add some missing module dependencies and move some dependency declarations from module.properties files into build.gradle files

labkey-susanh · labkey-susanh · commit 7695eb30f07e · 2020-10-06T11:57:42.000-07:00
diff --git a/laboratory/build.gradle b/laboratory/build.gradle
@@ -4,5 +4,6 @@ dependencies {
     BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
     BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")
     apiImplementation "net.sf.opencsv:opencsv:${opencsvVersion}"
+    BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "published", depExtension: "module")
     BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ dependencies {`
`4`	`4`	`BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")`
`5`	`5`	`BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")`
`6`	`6`	`apiImplementation "net.sf.opencsv:opencsv:${opencsvVersion}"`
	`7`	`+ BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "published", depExtension: "module")`
`7`	`8`	`BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")`
`8`	`9`	`}`