Skip to content

Commit f720bee

Browse files
author
José Pereda
authored
Use JDK and JavaFX 21 (gluonhq#649)
1 parent 1562181 commit f720bee

9 files changed

+20
-20
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: oracle-actions/setup-java@v1
1818
with:
1919
website: jdk.java.net
20-
release: 20
20+
release: 21
2121

2222
- name: Run Tests (Linux)
2323
if: runner.os == 'Linux'

.github/workflows/bundles-kit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
required: true
88
type: string
99
java-version:
10-
default: '20'
10+
default: '21'
1111
required: false
1212
type: string
1313

.github/workflows/bundles-linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
required: true
1111
type: string
1212
java-version:
13-
default: '20'
13+
default: '21'
1414
required: false
1515
type: string
1616
javafx-version:
17-
default: '20.0.1'
17+
default: '21'
1818
required: false
1919
type: string
2020
test:

.github/workflows/bundles-mac.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
required: true
1111
type: string
1212
java-version:
13-
default: '20'
13+
default: '21'
1414
required: false
1515
type: string
1616
javafx-version:
17-
default: '20.0.1'
17+
default: '21'
1818
required: false
1919
type: string
2020
test:

.github/workflows/bundles-mac_aarch64.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
required: true
1111
type: string
1212
java-version:
13-
default: '20'
13+
default: '21'
1414
required: false
1515
type: string
1616
javafx-version:
17-
default: '20.0.1'
17+
default: '21'
1818
required: false
1919
type: string
2020
test:

.github/workflows/bundles-windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
required: true
1111
type: string
1212
java-version:
13-
default: '20'
13+
default: '21'
1414
required: false
1515
type: string
1616
javafx-version:
17-
default: '20.0.1'
17+
default: '21'
1818
required: false
1919
type: string
2020
test:

.github/workflows/early-access.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
branches: [ master ]
66

77
env:
8-
JAVAFX_VERSION: '20.0.1'
9-
JAVA_VERSION: '20'
8+
JAVAFX_VERSION: '21'
9+
JAVA_VERSION: '21'
1010

1111
jobs:
1212
precheck:

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_dispatch:
55

66
env:
7-
JAVAFX_VERSION: '20.0.1'
8-
JAVA_VERSION: '20'
7+
JAVAFX_VERSION: '21'
8+
JAVA_VERSION: '21'
99

1010
jobs:
1111
precheck:

pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
</modules>
1717

1818
<properties>
19-
<java.version>20</java.version>
19+
<java.version>21</java.version>
2020
<maven.compiler.source>${java.version}</maven.compiler.source>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
2222
<maven.compiler.release>${java.version}</maven.compiler.release>
23-
<javafx.version>21-ea+24</javafx.version>
23+
<javafx.version>21</javafx.version>
2424
<aether.version>1.1.0</aether.version>
25-
<charm.glisten.version>6.2.0</charm.glisten.version>
26-
<gluon.attach.version>4.0.15</gluon.attach.version>
27-
<junit.jupiter.version>5.8.2</junit.jupiter.version>
25+
<charm.glisten.version>6.2.2</charm.glisten.version>
26+
<gluon.attach.version>4.0.19</gluon.attach.version>
27+
<junit.jupiter.version>5.10.0</junit.jupiter.version>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<project.github.repository>gluonhq/scenebuilder</project.github.repository>
3030
<repository.url>github.com:${project.github.repository}</repository.url>
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>org.openjfx</groupId>
8080
<artifactId>javafx-maven-plugin</artifactId>
81-
<version>0.0.5</version>
81+
<version>0.0.8</version>
8282
<configuration>
8383
<mainClass>${main.class.name}</mainClass>
8484
<options>

0 commit comments

Comments
 (0)