Migrate to getSchemaVersion(). Remove ConsolidateScripts. (#15)

labkey-adam · web-flow · commit 268c9bb64950 · 2020-02-10T14:03:06.000-07:00
diff --git a/LDK/module.properties b/LDK/module.properties
@@ -1,4 +1,3 @@
 ModuleClass: org.labkey.ldk.LDKModule
 ModuleDependencies: Experiment, Pipeline
-ConsolidateScripts: false
 ManageVersion: false
diff --git a/LDK/src/org/labkey/ldk/LDKModule.java b/LDK/src/org/labkey/ldk/LDKModule.java
@@ -17,6 +17,7 @@
 package org.labkey.ldk;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.DbScope;
 import org.labkey.api.data.bigiron.ClrAssemblyManager;
@@ -53,7 +54,7 @@ public String getName()
     }
 
     @Override
-    public double getVersion()
+    public @Nullable Double getSchemaVersion()
     {
         return 12.39;
     }
diff --git a/laboratory/module.properties b/laboratory/module.properties
@@ -1,4 +1,3 @@
 ModuleClass: org.labkey.laboratory.LaboratoryModule
 ModuleDependencies: Experiment, LDK
-ConsolidateScripts: false
 ManageVersion: false
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryModule.java b/laboratory/src/org/labkey/laboratory/LaboratoryModule.java
@@ -16,6 +16,7 @@
 package org.labkey.laboratory;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
@@ -74,7 +75,7 @@ public String getName()
     }
 
     @Override
-    public double getVersion()
+    public @Nullable Double getSchemaVersion()
     {
         return 12.304;
     }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package org.labkey.ldk;`
`18`	`18`
`19`	`19`	`import org.jetbrains.annotations.NotNull;`
	`20`	`+import org.jetbrains.annotations.Nullable;`
`20`	`21`	`import org.labkey.api.data.Container;`
`21`	`22`	`import org.labkey.api.data.DbScope;`
`22`	`23`	`import org.labkey.api.data.bigiron.ClrAssemblyManager;`
`@@ -53,7 +54,7 @@ public String getName()`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`@Override`
`56`		`- public double getVersion()`
	`57`	`+ public @Nullable Double getSchemaVersion()`
`57`	`58`	`{`
`58`	`59`	`return 12.39;`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`package org.labkey.laboratory;`
`17`	`17`
`18`	`18`	`import org.jetbrains.annotations.NotNull;`
	`19`	`+import org.jetbrains.annotations.Nullable;`
`19`	`20`	`import org.json.JSONObject;`
`20`	`21`	`import org.labkey.api.data.Container;`
`21`	`22`	`import org.labkey.api.data.ContainerManager;`
`@@ -74,7 +75,7 @@ public String getName()`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`@Override`
`77`		`- public double getVersion()`
	`78`	`+ public @Nullable Double getSchemaVersion()`
`78`	`79`	`{`
`79`	`80`	`return 12.304;`
`80`	`81`	`}`