Merge branch 'gluonhq:master' into issue-120

.editorconfig

@@ -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
+

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: '21'
+  JAVA_VERSION: '22'
 
 jobs:
   verify:

.github/workflows/bundles-kit.yml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
 

.github/workflows/bundles-linux.yml

@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:

.github/workflows/bundles-mac.yml

@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:

.github/workflows/bundles-mac_aarch64.yml

@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:
@@ -37,9 +37,7 @@ 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
 
@@ -51,13 +49,11 @@ jobs:
 
       - 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
         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
           unzip /tmp/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip -d /tmp
 
@@ -118,7 +114,3 @@ jobs:
         with:
           name: artifacts
           path: ${{ steps.outputfile.outputs.path }}
-
-      - name: Delete keychain
-        run: |
-          security delete-keychain "${{ env.KEYCHAIN }}".keychain

.github/workflows/bundles-windows.yml

@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:

.github/workflows/early-access.yml

@@ -5,8 +5,8 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '22'
+  JAVA_VERSION: '22'
 
 jobs:
   precheck:

.github/workflows/release.yml

@@ -11,8 +11,8 @@ on:
           - GA
 
 env:
-  JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '22'
+  JAVA_VERSION: '22'
 
 jobs:
   precheck:

README.md

@@ -110,3 +110,4 @@ There will be a report for each sub-project, one for `app` and one for `kit`.
 * Kit: `kit/target/site/checkstyle.html`
 * App: `app/target/site/checkstyle.html`
 
+This project makes use of [EditorConfig](https://editorconfig.org/) which is [directly supported](https://editorconfig.org/#pre-installed) by IntelliJ IDEA. There are plugins for NetBeans, Eclipse and Visual Studio and [more](https://editorconfig.org/#download). EditorConfig ensures via configuration in `.editorconfig` file, that the proper indentation is used.

app/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>21.0.2-SNAPSHOT</version>
+        <version>22.0.1-SNAPSHOT</version>
     </parent>
 
     <properties>