From 197dbfb3aa4dc8c73e1fa31ffe45b2be28fe8193 Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Thu, 16 May 2024 09:39:56 -0400
Subject: [PATCH 1/3] build: build with JDK 21

---
 pom.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index b34bd8d..fc966db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.janelia.saalfeldlab</groupId>
 	<artifactId>saalfx</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 
 	<name>Saal FX</name>
 	<description>Saalfeld lab JavaFX tools and extensions</description>
@@ -37,18 +37,19 @@
 		<package-name>org.janelia.saalfeldlab.saalfx</package-name>
 
 		<!-- kotlin -->
-		<kotlin.version>1.9.0</kotlin.version>
-		<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
+		<kotlin.version>1.9.24</kotlin.version>
+		<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
 		<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
+		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
 
-		<scijava.jvm.build.version>11</scijava.jvm.build.version>
-		<scijava.jvm.version>11</scijava.jvm.version>
+		<scijava.jvm.version>21</scijava.jvm.version>
 
 		<!-- JavaFx-->
-		<javafx.version>18.0.1</javafx.version>
+		<javafx.version>22.0.1</javafx.version>
 		<testfx.version>4.0.16-alpha</testfx.version>
 
 		<dokka.version>1.4.30</dokka.version>
+		<enforcer.skip>true</enforcer.skip>
 	</properties>
 
 	<developers>
@@ -56,7 +57,7 @@
 			<id>hanslovsky</id>
 			<name>Philipp Hanslovsky</name>
 			<email>hanslovskyp@janelia.hhmi.org</email>
-			<url />
+			<url/>
 			<organization>HHMI Janelia</organization>
 			<organizationUrl>http://janelia.org/</organizationUrl>
 			<roles>
@@ -71,7 +72,7 @@
 			<id>cmhulbert</id>
 			<name>Caleb Hulbert</name>
 			<email>hulbertc@hhmi.org</email>
-			<url />
+			<url/>
 			<organization>HHMI Janelia</organization>
 			<organizationUrl>http://janelia.org/</organizationUrl>
 			<roles>
@@ -83,9 +84,9 @@
 	</developers>
 
 	<contributors>
-		   <contributor>
-				   <name>none</name>
-		   </contributor>
+		<contributor>
+			<name>none</name>
+		</contributor>
 	</contributors>
 
 
@@ -110,7 +111,7 @@
 	<scm>
 		<connection>scm:git:git://github.com/saalfeldlab/saalfx</connection>
 		<developerConnection>scm:git:git@github.com:saalfeldlab/saalfx.git</developerConnection>
-		<tag>saalfx-1.2.0</tag>
+		<tag>saalfx-1.3.0</tag>
 		<url>https://github.com/saalfeldlab/saalfx</url>
 	</scm>
 
@@ -235,7 +236,7 @@
 		<dependency>
 			<groupId>org.testfx</groupId>
 			<artifactId>openjfx-monocle</artifactId>
-			<version>jdk-12.0.1+2</version>
+			<version>21.0.2</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>

From 0390fc059f27a63cf37bc485e3f314770b171351 Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Thu, 16 May 2024 09:43:41 -0400
Subject: [PATCH 2/3] ci: bump jdk to 21

---
 .github/workflows/build-main.yml | 4 ++--
 .github/workflows/build-pr.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index afc4cb4..c655da1 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -26,10 +26,10 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
       - name: Set up CI environment
         run: .github/setup.sh
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 9f76c2b..082dbe9 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -24,10 +24,10 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
       - name: Set up CI environment
         run: .github/setup.sh

From b83ec14d743a9268b9df7f63cdad595d11788217 Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Thu, 16 May 2024 09:48:09 -0400
Subject: [PATCH 3/3] ci(dep): migrate adopt to temurin

https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/
---
 .github/workflows/build-main.yml | 2 +-
 .github/workflows/build-pr.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index c655da1..89a68ea 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 082dbe9..66269fd 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build