Merge branch 'gluonhq:master' into issue-120

gluonhq · Mar 18, 2024 · 1d60439 · 1d60439
2 parents ca92d54 + 8c66e57
commit 1d60439
Show file tree

Hide file tree

Showing 26 changed files with 913 additions and 252 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,6 +2,9 @@ name: Scene Builder PR Verify
 on:
   pull_request:
 
+env:
+  JAVA_VERSION: '21'
+
 jobs:
   verify:
     runs-on: ${{ matrix.os }}
@@ -17,7 +20,7 @@ jobs:
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 19
+          release: ${{ env.JAVA_VERSION }}
 
       - name: Run Tests (Linux)
         if: runner.os == 'Linux'

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: '19'
+        default: '21.0.1'
         required: false
         type: string
 
@@ -43,4 +43,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: artifacts
-          path: kit/target/lib/*.jar
+          path: kit/target/lib/*.jar
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: '19'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '19'
+        default: '21.0.1'
         required: false
         type: string
       test:
@@ -101,4 +101,4 @@ jobs:
           name: artifacts
           path: |
             app/target/install/*.deb
-            app/target/install/*.rpm
+            app/target/install/*.rpm
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: '19'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '19'
+        default: '21.0.1'
         required: false
         type: string
       test:
@@ -101,17 +101,15 @@ jobs:
           INSTALL_DIR: app/target/install
 
       - name: Notarize Release Build
-        uses: erwin1/xcode-notarize@main
+        uses: erwin1/xcode-notarizer@v1
         with:
           product-path: ${{ steps.outputfile.outputs.path }}
-          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
-          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
-          primary-bundle-id: com.gluonhq.scenebuilder
-          asc-provider: ${{ secrets.MACSIGN_PREFIX }}
-          verbose: true
+          apple-id: ${{ secrets.NOTARIZATION_USERNAME }}
+          app-password: ${{ secrets.NOTARIZATION_PASSWORD }}
+          team-id: ${{ secrets.MACSIGN_PREFIX }}
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
           name: artifacts
-          path: ${{ steps.outputfile.outputs.path }}
+          path: ${{ steps.outputfile.outputs.path }}
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: '19'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '19'
+        default: '21.0.1'
         required: false
         type: string
       test:
@@ -106,14 +106,12 @@ jobs:
           INSTALL_DIR: app/target/install
 
       - name: Notarize Release Build
-        uses: erwin1/xcode-notarize@main
+        uses: erwin1/xcode-notarizer@v1
         with:
           product-path: ${{ steps.outputfile.outputs.path }}
-          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
-          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
-          primary-bundle-id: com.gluonhq.scenebuilder
-          asc-provider: ${{ secrets.MACSIGN_PREFIX }}
-          verbose: true
+          apple-id: ${{ secrets.NOTARIZATION_USERNAME }}
+          app-password: ${{ secrets.NOTARIZATION_PASSWORD }}
+          team-id: ${{ secrets.MACSIGN_PREFIX }}
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2

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: '19'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '19'
+        default: '21.0.1'
         required: false
         type: string
       test:
@@ -83,6 +83,7 @@ jobs:
 
       - name: Codesign
         uses: erwin1/code-sign-action@master
+        if: false
         with:
           certificate: '${{ secrets.WINDOWS_CERTIFICATE }}'
           password: '${{ secrets.WINDOWS_PASSWORD }}'
@@ -93,4 +94,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: artifacts
-          path: app/target/install/*.msi
+          path: app/target/install/*.msi
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -5,8 +5,8 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '19'
-  JAVA_VERSION: '19'
+  JAVAFX_VERSION: '21.0.1'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:
@@ -148,4 +148,4 @@ jobs:
           name: jreleaser-logs
           path: |
             target/jreleaser/trace.log
-            target/jreleaser/output.properties
+            target/jreleaser/output.properties
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,10 +2,17 @@ name: Release
 
 on:
   workflow_dispatch:
+    inputs:
+      candidate:
+        type: choice
+        description: Choose a candidate
+        options:
+          - RC
+          - GA
 
 env:
-  JAVAFX_VERSION: '19'
-  JAVA_VERSION: '19'
+  JAVAFX_VERSION: '21.0.1'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:
@@ -37,14 +44,16 @@ jobs:
         id: vars
         shell: bash
         run: |
-          mvn -B versions:set -DremoveSnapshot
+          mvn -B -ntp -q versions:set -DremoveSnapshot -DgenerateBackupPoms=false
           PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           APP_VERSION=$PROJECT_VERSION
           S3_PATH=$PROJECT_VERSION
-          if [[ "$PROJECT_VERSION" == *-RC* ]]; then
-              APP_VERSION=`echo $PROJECT_VERSION | cut -d- -f1`
+          CANDIDATE=${{ github.event.inputs.candidate }}
+          if [[ "$CANDIDATE" == RC ]]; then
+              PROJECT_VERSION=${PROJECT_VERSION}-RC
               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

diff --git a/README.md b/README.md
@@ -108,5 +108,5 @@ mvn checkstyle:checkstyle
 There will be a report for each sub-project, one for `app` and one for `kit`.
 
 * Kit: `kit/target/site/checkstyle.html`
-* App: `kit/target/site/checkstyle.html`
+* App: `app/target/site/checkstyle.html`
 
diff --git a/app/pom.xml b/app/pom.xml
@@ -7,13 +7,14 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>20.0.0-SNAPSHOT</version>
+        <version>21.0.2-SNAPSHOT</version>
     </parent>
 
     <properties>
         <main.class.name>com.oracle.javafx.scenebuilder.app.SceneBuilderApp</main.class.name>
         <!-- For about.properties file -->
         <buildDate>${maven.build.timestamp}</buildDate>
+        <buildDateFormat>${maven.build.timestamp.format}</buildDateFormat>
         <javaVersion>${java.version}, ${java.runtime.name}</javaVersion>
         <javafxVersion>${javafx.version}</javafxVersion>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
@@ -64,4 +65,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>