Skip to content

Commit

Permalink
Merge branch 'master' into issue-424
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver-Loeffler authored Oct 1, 2024
2 parents 1ccef35 + f0c5860 commit d1e8cc5
Show file tree
Hide file tree
Showing 126 changed files with 3,130 additions and 423 deletions.
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# EditorConfig is awesome: https://EditorConfig.org
root = true

[*.java]
indent_style = space
indent_size = 4

[*.fxml]
indent_style = space
indent_size = 2

[*.yml]
indent_style = space
indent_size = 2

[pom.xml]
indent_style = space
indent_size = 4

6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:

env:
JAVA_VERSION: '21'
JAVA_VERSION: '23'

jobs:
verify:
Expand All @@ -14,10 +14,10 @@ jobs:
os: [ macos-latest, windows-latest, ubuntu-latest ]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
release: ${{ env.JAVA_VERSION }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/bundles-kit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ on:
required: true
type: string
java-version:
default: '21.0.1'
default: '23'
required: false
type: string

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
release: ${{ inputs.java-version }}

- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -40,7 +40,7 @@ jobs:
PROJECT_VERSION: ${{ inputs.project-version }}

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: artifacts
name: scenebuilder-kit-${{ inputs.project-version }}.jar
path: kit/target/lib/*.jar
27 changes: 18 additions & 9 deletions .github/workflows/bundles-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '21.0.1'
default: '23'
required: false
type: string
javafx-version:
default: '21.0.1'
default: '23'
required: false
type: string
test:
Expand All @@ -29,21 +29,24 @@ jobs:
- name: Install packages
run: sudo apt-get install xdg-utils

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
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
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -89,16 +92,22 @@ 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 }}
INSTALL_DIR: app/target/install

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: artifacts
name: SceneBuilder-${{ inputs.project-version }}.deb
path: |
app/target/install/*.deb
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: SceneBuilder-${{ inputs.project-version }}.rpm
path: |
app/target/install/*.rpm
25 changes: 14 additions & 11 deletions .github/workflows/bundles-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '21.0.1'
default: '23'
required: false
type: string
javafx-version:
default: '21.0.1'
default: '23'
required: false
type: string
test:
Expand All @@ -36,12 +36,12 @@ on:
required: true
jobs:
build:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
Expand All @@ -52,12 +52,15 @@ 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
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -109,7 +112,7 @@ jobs:
team-id: ${{ secrets.MACSIGN_PREFIX }}

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: artifacts
name: SceneBuilder-${{ inputs.project-version }}-amd64.dmg
path: ${{ steps.outputfile.outputs.path }}
33 changes: 14 additions & 19 deletions .github/workflows/bundles-mac_aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '21.0.1'
default: '23'
required: false
type: string
javafx-version:
default: '21.0.1'
default: '23'
required: false
type: string
test:
Expand All @@ -37,32 +37,31 @@ on:
jobs:
build:
name: macOS on M1
runs-on: [macOS, ARM64]
env:
KEYCHAIN: job-${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
release: ${{ inputs.java-version }}

- uses: Apple-Actions/import-codesign-certs@v1
with:
keychain: ${{ env.KEYCHAIN }}
p12-file-base64: ${{ secrets.CERTIFICATES_FILE_BASE64 }}
p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}

- name: Setup JavaFX
id: javafx
run: |
rm -rf /tmp/javafx-jmods-${{ inputs.javafx-version }}
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
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -94,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 }}
Expand All @@ -114,11 +113,7 @@ jobs:
team-id: ${{ secrets.MACSIGN_PREFIX }}

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: artifacts
name: SceneBuilder-${{ inputs.project-version }}-aarch64.dmg
path: ${{ steps.outputfile.outputs.path }}

- name: Delete keychain
run: |
security delete-keychain "${{ env.KEYCHAIN }}".keychain
21 changes: 12 additions & 9 deletions .github/workflows/bundles-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '21.0.1'
default: '23'
required: false
type: string
javafx-version:
default: '21.0.1'
default: '23'
required: false
type: string
test:
Expand All @@ -33,22 +33,25 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/setup-java@v1
uses: oracle-actions/setup-java@v1.4.0
with:
website: jdk.java.net
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
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -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 }}
Expand All @@ -91,7 +94,7 @@ jobs:
folder: 'app/target/install'

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: artifacts
name: SceneBuilder-${{ inputs.project-version }}.msi
path: app/target/install/*.msi
Loading

0 comments on commit d1e8cc5

Please sign in to comment.