build: Use Java and JavaFX 23-ea (gluonhq#707)

Oliver-Loeffler · Aug 26, 2024 · d36d9f6 · d36d9f6
1 parent 37aeb21
commit d36d9f6
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
  pull_request:
 
 env:
- JAVA_VERSION: '22'
+ JAVA_VERSION: '23'
 
 jobs:
  verify:

diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
@@ -7,7 +7,7 @@ on:
  required: true
  type: string
  java-version:
- default: '22'
+ default: '23'
  required: false
  type: string
 

diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
@@ -10,11 +10,11 @@ on:
  required: true
  type: string
  java-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  javafx-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  test:
@@ -38,8 +38,11 @@ jobs:
  release: ${{ inputs.java-version }}
 
  - name: Setup JavaFX
+ id: javafx
  run: |
- wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip
+ JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
+ echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
+ wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip
  unzip /tmp/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip -d /tmp
 
  - name: Cache Maven packages
@@ -89,7 +92,7 @@ jobs:
  ls ${{ env.INSTALL_DIR }}
  env:
  MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
- JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
+ JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
  JPACKAGE_HOME: ${{ env.JAVA_HOME }}
  PROJECT_VERSION: ${{ inputs.project-version }}
  APP_VERSION: ${{ inputs.app-version }}

diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
@@ -10,11 +10,11 @@ on:
  required: true
  type: string
  java-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  javafx-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  test:
@@ -52,8 +52,11 @@ jobs:
  p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}
 
  - name: Setup JavaFX
+ id: javafx
  run: |
- wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip
+ JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
+ echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
+ wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip
  unzip /tmp/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip -d /tmp
 
  - name: Cache Maven packages
@@ -89,10 +92,10 @@ jobs:
  --mac-sign
  mv ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.APP_VERSION }}.dmg ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg
  ls ${{ env.INSTALL_DIR }}
- echo ::set-output name=path::${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg
+ echo path=${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg >> $GITHUB_OUTPUT
  env:
  MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
- JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
+ JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
  JPACKAGE_HOME: ${{ env.JAVA_HOME }}
  MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
  MACSIGN_USER: ${{ secrets.MACSIGN_USER }}

diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
@@ -10,11 +10,11 @@ on:
  required: true
  type: string
  java-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  javafx-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  test:
@@ -53,8 +53,11 @@ jobs:
  p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}
 
  - name: Setup JavaFX
+ id: javafx
  run: |
- wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip
+ JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
+ echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
+ wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip
  unzip /tmp/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip -d /tmp
 
  - name: Cache Maven packages
@@ -90,10 +93,10 @@ jobs:
  --mac-sign
  mv ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.APP_VERSION }}.dmg ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg
  ls ${{ env.INSTALL_DIR }}
- echo ::set-output name=path::${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg
+ echo path=${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg >> $GITHUB_OUTPUT
  env:
  MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
- JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
+ JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
  JPACKAGE_HOME: ${{ env.JAVA_HOME }}
  MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
  MACSIGN_USER: ${{ secrets.MACSIGN_USER }}

diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
@@ -10,11 +10,11 @@ on:
  required: true
  type: string
  java-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  javafx-version:
- default: '22'
+ default: '23'
  required: false
  type: string
  test:
@@ -42,9 +42,12 @@ jobs:
  release: ${{ inputs.java-version }}
 
  - name: Setup JavaFX
+ id: javafx
  shell: pwsh
  run: |
- Invoke-WebRequest -Uri https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip -OutFile D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip
+ $JAVAFX_MAJOR_VERSION = '${{ inputs.javafx-version }}' -split '-' | Select-Object -Index 0
+ echo "JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION" >> $env:GITHUB_OUTPUT
+ Invoke-WebRequest -Uri https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip -OutFile D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip
  Expand-Archive -Force D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip D:\
 
  - name: Cache Maven packages
@@ -75,7 +78,7 @@ jobs:
  call dir ${{ env.INSTALL_DIR }}
  env:
  MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
- JAVAFX_HOME: D:\javafx-jmods-${{ inputs.javafx-version }}
+ JAVAFX_HOME: D:\javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}
  JPACKAGE_HOME: ${{ env.JAVA_HOME }}
  PROJECT_VERSION: ${{ inputs.project-version }}
  APP_VERSION: ${{ inputs.app-version }}

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -5,8 +5,8 @@ on:
  branches: [ master ]
 
 env:
- JAVAFX_VERSION: '22'
- JAVA_VERSION: '22'
+ JAVA_VERSION: '23'
+ JAVAFX_VERSION: '23-ea+27'
 
 jobs:
  precheck:
@@ -41,8 +41,8 @@ jobs:
  PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
  APP_VERSION=$PROJECT_VERSION
  APP_VERSION=${APP_VERSION%-*}
- echo ::set-output name=APP_VERSION::$APP_VERSION
- echo ::set-output name=PROJECT_VERSION::$PROJECT_VERSION
+ echo APP_VERSION=$APP_VERSION >> $GITHUB_OUTPUT
+ echo PROJECT_VERSION=$PROJECT_VERSION >> $GITHUB_OUTPUT
 
  linux-bundles:
  needs: [precheck]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,8 +11,8 @@ on:
  - GA
 
 env:
- JAVAFX_VERSION: '22'
- JAVA_VERSION: '22'
+ JAVAFX_VERSION: '23'
+ JAVA_VERSION: '23'
 
 jobs:
  precheck:
@@ -54,9 +54,9 @@ jobs:
  S3_PATH=RC/$PROJECT_VERSION
  fi
  echo "Releasing.. "$PROJECT_VERSION
- echo ::set-output name=APP_VERSION::$APP_VERSION
- echo ::set-output name=PROJECT_VERSION::$PROJECT_VERSION
- echo ::set-output name=S3_PATH::$S3_PATH
+ echo APP_VERSION=$APP_VERSION >> $GITHUB_OUTPUT
+ echo PROJECT_VERSION=$PROJECT_VERSION >> $GITHUB_OUTPUT
+ echo S3_PATH=$S3_PATH >> $GITHUB_OUTPUT
 
  linux-bundles:
  needs: [precheck]

diff --git a/pom.xml b/pom.xml
@@ -16,11 +16,11 @@
  </modules>
 
  <properties>
- <java.version>22</java.version>
+ <java.version>23</java.version>
  <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>22</javafx.version>
+ <javafx.version>23-ea+27</javafx.version>
  <aether.version>1.1.0</aether.version>
  <charm.glisten.version>6.2.2</charm.glisten.version>
  <gluon.attach.version>4.0.19</gluon.attach.version>