Feat/smooth action

.github/workflows/maven-build-all-installer.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macOS-ARM64]
     runs-on: ${{ matrix.os }}
     env:
       RELEASE_INSTALLERS: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@@ -50,58 +50,14 @@ jobs:
           java-package: jdk+fx
           cache: 'maven'
       - name: "Build with Maven"
-        if: matrix.os != 'macos-latest'
+        if: matrix.os != 'macos-latest' && matrix.os != 'macOS-ARM64'
         run: mvn -B clean install -DskipTests -Pbuild-installer --file pom.xml
       - name: "Build with Maven (macOS No Signing)"
         env:
           MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-        if: ${{ env.MACOS_CERTIFICATE == null && matrix.os == 'macos-latest' }}
+        if: ${{ env.MACOS_CERTIFICATE == null && (matrix.os == 'macos-latest' || matrix.os == 'macOS-ARM64') }}
         run: mvn -B clean install -DskipTests -Pbuild-installer --file pom.xml
-      - name: "Build with Maven (macOS Signed)"
-        env:
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-        if: ${{ env.MACOS_CERTIFICATE != null && matrix.os == 'macos-latest' }}
-        run: |
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p temppass build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p temppass build.keychain
-          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k temppass build.keychain
-          export IDENTITY=$(security find-identity -v)
-          echo $(security find-identity -v)
-          mvn -B clean install -DskipTests -Pbuild-installer -Pmacos-sign --file pom.xml
-      - name: "Codesign DMG"
-        env:
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-        if: ${{ env.MACOS_CERTIFICATE != null && matrix.os == 'macos-latest' }}
-        run: |
-          export DMG_PATH=$(ls ./target/*.dmg)
-          /usr/bin/codesign --deep --force -s ${{ env.DEV_IDENTITY}} $DMG_PATH -v
-          echo DMG_PATH=$DMG_PATH >> $GITHUB_ENV
-          echo ${{ env.DMG_PATH }}
-      - name: "Notarize DMG"
-        env:
-          APP_EMAIL: ${{ secrets.APP_EMAIL }}
-          APP_PASS: ${{ secrets.APP_PASS }}
-        if: ${{ env.APP_EMAIL != null && matrix.os == 'macos-latest' }}
-        uses: devbotsxyz/xcode-notarize@v1
-        with:
-          product-path: ${{ env.DMG_PATH }}
-          primary-bundle-id: ${{ env.PRIMARY_BUNDLE_ID }}
-          appstore-connect-username: ${{ secrets.APP_EMAIL }}
-          appstore-connect-password: ${{ secrets.APP_PASS }}
-      - name: "Staple DMG"
-        env:
-          APP_EMAIL: ${{ secrets.APP_EMAIL }}
-          APP_PASS: ${{ secrets.APP_PASS }}
-        if: ${{ env.APP_EMAIL != null && matrix.os == 'macos-latest' }}
-        uses: devbotsxyz/xcode-staple@v1
-        with:
-          product-path: ${{ env.DMG_PATH }}
       - name: Update Automatic Release
         uses: marvinpinto/action-automatic-releases@latest
         if: ${{ env.RELEASE_INSTALLERS }}

pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.janelia.saalfeldlab</groupId>
 	<artifactId>paintera</artifactId>
-	<version>0.34.2-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 
 	<name>Paintera</name>
 	<description>New Era Painting and annotation tool</description>
@@ -53,7 +53,7 @@
 		<javadoc.skip>true</javadoc.skip>
 		<maven.javadoc.skip>${javadoc.skip}</maven.javadoc.skip>
 
-		<saalfx.version>0.7.0</saalfx.version>
+		<saalfx.version>1.0.0</saalfx.version>
 
 		<janino.version>3.0.7</janino.version>
 		<logback.version>1.4.0</logback.version>
@@ -75,11 +75,11 @@
 		<macos.sign />
 		<macos.sign.identity />
 
-		<n5.version>3.0.0</n5.version>
+		<n5.version>3.0.2</n5.version>
 		<n5-hdf5.version>2.0.0</n5-hdf5.version>
 		<n5-google-cloud.version>4.0.0</n5-google-cloud.version>
 		<n5-aws-s3.version>4.0.1</n5-aws-s3.version>
-		<n5-zarr.version>1.0.0</n5-zarr.version>
+		<n5-zarr.version>1.0.1</n5-zarr.version>
 		<n5-imglib2.version>7.0.0</n5-imglib2.version>
 		<n5-universe.version>1.1.0</n5-universe.version>
 
@@ -88,7 +88,11 @@
 
 
 	<dependencies>
-
+		<dependency>
+			<groupId>dev.dirs</groupId>
+			<artifactId>directories</artifactId>
+			<version>26</version>
+		</dependency>
 		<dependency>
 			<groupId>com.microsoft.onnxruntime</groupId>
 			<artifactId>onnxruntime</artifactId>
@@ -180,7 +184,7 @@
 		<dependency>
 			<groupId>net.imglib2</groupId>
 			<artifactId>imglib2-label-multisets</artifactId>
-			<version>0.11.5</version>
+			<version>0.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>sc.fiji</groupId>
@@ -226,12 +230,12 @@
 		<dependency>
 			<groupId>org.janelia.saalfeldlab</groupId>
 			<artifactId>label-utilities</artifactId>
-			<version>0.5.2-SNAPSHOT</version>
+			<version>0.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.janelia.saalfeldlab</groupId>
 			<artifactId>label-utilities-n5</artifactId>
-			<version>0.3.3-SNAPSHOT</version>
+			<version>0.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.controlsfx</groupId>
@@ -983,42 +987,6 @@
 		<id>build-installer</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.0.0</version>
-						<executions>
-							<execution>
-								<phase>prepare-package</phase>
-								<id>normalize-app-version1</id>
-								<goals>
-									<goal>regex-property</goal>
-								</goals>
-								<configuration>
-									<name>app._normalVersion</name>
-									<value>${project.version}</value>
-									<regex>\.([0-9]+)-SNAPSHOT</regex>
-									<replacement>.000$1</replacement>
-									<failIfNoMatch>false</failIfNoMatch>
-								</configuration>
-							</execution>
-							<execution>
-								<phase>prepare-package</phase>
-								<id>normalize-app-version2</id>
-								<goals>
-									<goal>regex-property</goal>
-								</goals>
-								<configuration>
-									<name>app.normalVersion</name>
-									<!--suppress UnresolvedMavenProperty -->
-									<value>${app._normalVersion}</value>
-									<regex>^0\.</regex>
-									<replacement>99.</replacement>
-									<failIfNoMatch>false</failIfNoMatch>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<!-- https://github.com/wiverson/jtoolprovider-plugin -->
 						<groupId>io.github.wiverson</groupId>
@@ -1061,14 +1029,13 @@
 								</goals>
 								<configuration>
 									<!--suppress UnresolvedMavenProperty -->
-									<appVersion>${app.normalVersion}</appVersion>
 									<mainJar>${project.build.finalName}.jar</mainJar>
 									<toolName>jpackage</toolName>
 									<writeOutputToLog>true</writeOutputToLog>
 									<writeErrorsToLog>true</writeErrorsToLog>
 									<failOnError>true</failOnError>
 									<removeDirectories>${project.build.directory}/installer-work</removeDirectories>
-									<args>@${project.build.directory}/packaging/${os.detected.name}-jpackage.txt</args>
+									<args>@${project.build.directory}/packaging/${os.detected.name}/jpackage.txt</args>
 								</configuration>
 							</execution>
 						</executions>

src/main/java/bdv/fx/viewer/OverlayPane.java

@@ -63,7 +63,7 @@ public class OverlayPane<A> extends StackPane {
 	 */
 	final protected CopyOnWriteArrayList<OverlayRendererGeneric<GraphicsContext>> overlayRenderers;
 
-	private final CanvasPane canvasPane = new CanvasPane(1, 1);
+	private final CanvasPane canvasPane = new CanvasPane(0, 0);
 
 	private final ObservableList<Node> children = FXCollections.unmodifiableObservableList(super.getChildren());