Merge pull request #10 from BIOP/version-fix

Version fix

Author: lacan

build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Date
+import java.text.SimpleDateFormat
+
 plugins {
     `java-library`
     // To create a shadow/fat jar, including dependencies
@@ -23,7 +26,7 @@ description = "QuPath extension to use Warpy"
 
 group = "ch.epfl.biop"
 // artifact = "qupath-extension-warpy"
-version = "0.2.5-SNAPSHOT"
+version = "0.2.5"
 
 dependencies {
     val qupathVersion = "0.4.3" // For now
@@ -111,5 +114,14 @@ publishing {
     }
 }
 
+tasks.jar {
+    // Important to set version so this can be queried within QuPath
+    manifest {
+        attributes[ "Implementation-Vendor" ] = "Warpy developers"
+        attributes[ "Implementation-Version" ] = project.version
+        attributes[ "QuPath-build-time" ] = SimpleDateFormat("yyyy-MM-dd, HH:mm").format(Date())
+      }
+}
+
 val SoftwareComponentContainer.java
     get() = components.getByName("java") as AdhocComponentWithVariants

src/main/java/net/imglib2/realtransform/RealTransformSerializer.java

@@ -8,6 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import qupath.ext.biop.warpy.Warpy;
+import qupath.ext.biop.warpy.WarpyExtension;
 import qupath.ext.imagecombinerwarpy.gui.RealTransformInterpolation;
 import qupath.lib.io.GsonTools;
 
@@ -66,8 +67,8 @@ public RealTransformInterpolation deserialize(JsonElement jsonElement, Type type
 		    rtis.setInterpolation(interpolation);
             String version = obj.get("version").getAsString();
             rtis.setVersion(version);
-            if (!version.equals(Warpy.version)) {
-                logger.warn("Warpy version "+Warpy.version+" different from ImageServer "+version);
+            if (!version.equals(WarpyExtension.getWarpyVersion())) {
+                logger.warn("Warpy version "+WarpyExtension.getWarpyVersion()+" different from ImageServer "+version);
             }
             RealTransform transform = RealTransformSerializer.getRealTransformAdapter().fromJson(obj.get("transform"), RealTransform.class);
             rtis.setTransform(transform);

src/main/java/qupath/ext/biop/warpy/Warpy.java

@@ -62,9 +62,7 @@
  */
 
 public class Warpy {
-
-    final static public String version = "0.2.3-SNAPSHOT";
-
+    
     // Logger class that plays well with QuPath
     final private static Logger logger = LoggerFactory.getLogger(Warpy.class);
 

src/main/java/qupath/ext/biop/warpy/WarpyExtension.java

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import qupath.lib.common.GeneralTools;
 import qupath.lib.common.Version;
 import qupath.lib.gui.QuPathGUI;
 import qupath.lib.gui.extensions.GitHubProject;
@@ -42,8 +43,8 @@ public Version getQuPathVersion() {
         return QuPathExtension.super.getQuPathVersion();
     }
 
-    @Override
-    public Version getVersion() {
-        return Version.parse(Warpy.version);
+    public static String getWarpyVersion() {
+        String packageVersion = GeneralTools.getPackageVersion(WarpyExtension.class);
+        return Version.parse(packageVersion).toString();
     }
-}
+}

src/main/java/qupath/ext/imagecombinerwarpy/ImageCombinerWarpyExtension.java

@@ -153,11 +153,7 @@ public GitHubRepo getRepository() {
 
 	@Override
 	public Version getQuPathVersion() {
-		return Version.parse("0.3.1");
+		return QuPathExtension.super.getQuPathVersion();
 	}
 
-	@Override
-	public Version getVersion() {
-		return Version.parse(Warpy.version);
-	}
 }

src/main/java/qupath/ext/imagecombinerwarpy/gui/RealTransformInterpolation.java

@@ -16,6 +16,7 @@
 
 import net.imglib2.realtransform.RealTransform;
 import qupath.ext.biop.warpy.Warpy;
+import qupath.ext.biop.warpy.WarpyExtension;
 
 public class RealTransformInterpolation {
 
@@ -27,9 +28,9 @@ public class RealTransformInterpolation {
 	private RealTransform transform;
 
 	String version;
-	
+
 	public RealTransformInterpolation() {
-		version = Warpy.version;
+		version = WarpyExtension.getWarpyVersion();
 	}
 
 	public String getVersion() {
@@ -41,15 +42,15 @@ public void setVersion(String version) {
 	}
 
 	public RealTransformInterpolation(RealTransformInterpolation transformInterpolateSequence) {
-		version = Warpy.version;
+		version = WarpyExtension.getWarpyVersion();
 		int interpolation = transformInterpolateSequence.getInterpolation();
 		if (isValidInterpolation(interpolation))
 			this.interpolation = interpolation;
 		this.transform = transformInterpolateSequence.getTransform();
 	}
 
 	public RealTransformInterpolation(RealTransform transform, int interpolation) {
-		version = Warpy.version;
+		version = WarpyExtension.getWarpyVersion();
 		if (isValidInterpolation(interpolation))
 			this.interpolation = interpolation;