Skip to content

Commit

Permalink
Merge pull request #29 from saalfeldlab/jdk21
Browse files Browse the repository at this point in the history
build: with JDK 21

closes: #26
  • Loading branch information
cmhulbert authored May 16, 2024
2 parents 6eda90d + b83ec14 commit 3c90c19
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
- name: Set up CI environment
run: .github/setup.sh
- name: Execute the build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
- name: Set up CI environment
run: .github/setup.sh
- name: Execute the build
Expand Down
27 changes: 14 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -37,26 +37,27 @@
<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>
<developer>
<id>hanslovsky</id>
<name>Philipp Hanslovsky</name>
<email>[email protected]</email>
<url />
<url/>
<organization>HHMI Janelia</organization>
<organizationUrl>http://janelia.org/</organizationUrl>
<roles>
Expand All @@ -71,7 +72,7 @@
<id>cmhulbert</id>
<name>Caleb Hulbert</name>
<email>[email protected]</email>
<url />
<url/>
<organization>HHMI Janelia</organization>
<organizationUrl>http://janelia.org/</organizationUrl>
<roles>
Expand All @@ -83,9 +84,9 @@
</developers>

<contributors>
<contributor>
<name>none</name>
</contributor>
<contributor>
<name>none</name>
</contributor>
</contributors>


Expand All @@ -110,7 +111,7 @@
<scm>
<connection>scm:git:git://github.com/saalfeldlab/saalfx</connection>
<developerConnection>scm:git:[email protected]:saalfeldlab/saalfx.git</developerConnection>
<tag>saalfx-1.2.0</tag>
<tag>saalfx-1.3.0</tag>
<url>https://github.com/saalfeldlab/saalfx</url>
</scm>

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 3c90c19

Please sign in to comment.