Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Use Java and JavaFX 20 #619

Merged
merged 10 commits into from
Apr 18, 2023
Merged

build: Use Java and JavaFX 20 #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
276d053
Bumped OpenJFX/JavaFX version to 20.
Oliver-Loeffler Mar 23, 2023
c2ffd1a
Updated the build-workflow to make use of Java 20.
Oliver-Loeffler Mar 23, 2023
74cceb0
Updated bundles-kit.yml workflow to make use of Java 20.
Oliver-Loeffler Mar 23, 2023
b975ab2
Updated bundles-linux.yml to make use of JavaFX 20 and Java 20.
Oliver-Loeffler Mar 23, 2023
7c3285f
Updated bundles-mac.yml workflow to use JavaFX 20 and Java 20.
Oliver-Loeffler Mar 23, 2023
30475ac
Updated bundles-mac_aarch64.yml workflow to use JavaFX 20 and Java 20.
Oliver-Loeffler Mar 23, 2023
6bd4229
Updated bundles-windows.yml workflow to use Java 20 and JavaFX 20.
Oliver-Loeffler Mar 23, 2023
7bbba92
Updated early-access.yml to use JavaFX 20 and Java 20.
Oliver-Loeffler Mar 23, 2023
4ded213
Updated release.yml workflow to use JavaFX 20 and Java 20.
Oliver-Loeffler Mar 23, 2023
820e33d
Replaced javascript with an arbitrary token to avoid FXML loader fail…
Oliver-Loeffler Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: oracle-actions/setup-java@v1
with:
website: jdk.java.net
release: 19
release: 20

- name: Run Tests (Linux)
if: runner.os == 'Linux'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bundles-kit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
required: true
type: string
java-version:
default: '19'
default: '20'
required: false
type: string

Expand Down Expand Up @@ -43,4 +43,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: artifacts
path: kit/target/lib/*.jar
path: kit/target/lib/*.jar
6 changes: 3 additions & 3 deletions .github/workflows/bundles-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '19'
default: '20'
required: false
type: string
javafx-version:
default: '19'
default: '20'
required: false
type: string
test:
Expand Down Expand Up @@ -101,4 +101,4 @@ jobs:
name: artifacts
path: |
app/target/install/*.deb
app/target/install/*.rpm
app/target/install/*.rpm
6 changes: 3 additions & 3 deletions .github/workflows/bundles-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '19'
default: '20'
required: false
type: string
javafx-version:
default: '19'
default: '20'
required: false
type: string
test:
Expand Down Expand Up @@ -114,4 +114,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: artifacts
path: ${{ steps.outputfile.outputs.path }}
path: ${{ steps.outputfile.outputs.path }}
4 changes: 2 additions & 2 deletions .github/workflows/bundles-mac_aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '19'
default: '20'
required: false
type: string
javafx-version:
default: '19'
default: '20'
required: false
type: string
test:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bundles-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '19'
default: '20'
required: false
type: string
javafx-version:
default: '19'
default: '20'
required: false
type: string
test:
Expand Down Expand Up @@ -93,4 +93,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: artifacts
path: app/target/install/*.msi
path: app/target/install/*.msi
6 changes: 3 additions & 3 deletions .github/workflows/early-access.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches: [ master ]

env:
JAVAFX_VERSION: '19'
JAVA_VERSION: '19'
JAVAFX_VERSION: '20'
JAVA_VERSION: '20'

jobs:
precheck:
Expand Down Expand Up @@ -148,4 +148,4 @@ jobs:
name: jreleaser-logs
path: |
target/jreleaser/trace.log
target/jreleaser/output.properties
target/jreleaser/output.properties
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
workflow_dispatch:

env:
JAVAFX_VERSION: '19'
JAVA_VERSION: '19'
JAVAFX_VERSION: '20'
JAVA_VERSION: '20'

jobs:
precheck:
Expand Down
2 changes: 1 addition & 1 deletion kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/HeaderWithNotOnlyImports.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<?language javascript?>
<?language nameOfScriptLanguage?>
abhinayagarwal marked this conversation as resolved.
Show resolved Hide resolved

<!-- This could be a license header -->

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<javafx.version>19</javafx.version>
<javafx.version>20</javafx.version>
<aether.version>1.1.0</aether.version>
<charm.glisten.version>6.2.0</charm.glisten.version>
<gluon.attach.version>4.0.15</gluon.attach.version>
Expand Down