try to fix issue with sonoma

try with jdk 21

update pomxml

fix pom.xml

try to fix jdk

fix jdk

test

test

try with two mac architecture

specify name

fix name

.github/workflows/check-standard.yaml

@@ -25,6 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {os: macos-12,   r: 'release'}
           - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}

.github/workflows/maven-build-installer-macos.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven 
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Build macOS Installer
+name: Build macOS x64 Installer
 
 on:
   workflow_dispatch:
@@ -14,14 +14,14 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: 17.0.1
+          java-version: 21.0.3
           distribution: 'temurin'
           cache: 'maven'
 
@@ -51,5 +51,5 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN}}"
           automatic_release_tag: "macOS-latest"
           prerelease: true
-          title: "macOS Development Build"
+          title: "macOS x64 Development Build"
           files: ./RCaNconstructor/target/*.dmg

.github/workflows/maven-build-installer-macosaarch64.yml

@@ -0,0 +1,55 @@
+# This workflow will build a Java project with Maven 
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build macOS aarch64 Installer
+
+on:
+  workflow_dispatch:
+    branches: [ master ]
+  push:
+    branches: [ master ]
+    paths:
+      - RCaNconstructor/**
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v2
+        with:
+          java-version: 21.0.3
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Import signing certificate into keychain
+        run: |
+          KEYCHAIN_FILE=default.keychain
+          KEYCHAIN_PASSWORD=myvoiceismypassport
+          security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+          security default-keychain -s $KEYCHAIN_FILE
+          security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+          security import <(echo $SIGNING_CERTIFICATE_P12_DATA | base64 --decode) \
+                          -f pkcs12 \
+                          -k $KEYCHAIN_FILE \
+                          -P $SIGNING_CERTIFICATE_PASSWORD \
+                          -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+        env:
+          SIGNING_CERTIFICATE_P12_DATA: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }}
+          SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }}
+
+
+      - name: Build with Maven
+        run: mvn -B clean install --file RCaNconstructor/pom.xml
+      - name: Update Automatic Release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN}}"
+          automatic_release_tag: "macOSaarch64-latest"
+          prerelease: true
+          title: "macOS aarch64 Development Build"
+          files: ./RCaNconstructor/target/*.dmg

.github/workflows/maven-build-installer-unix.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: 17.0.1
+        java-version: 21.0.3
         distribution: 'temurin'
         cache: 'maven'
     - name: Build with Maven

.github/workflows/maven-build-installer-windows.yml

@@ -30,10 +30,10 @@ jobs:
     - name: Add Wix to Path
       run: echo "$HOME/target/wix" >> $GITHUB_PATH
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: 17.0.1
+        java-version: 21.0.3
         distribution: 'temurin'
         cache: 'maven'
     - name: Build with Maven

.github/workflows/maven-package.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: 17.0.1
+        java-version: 21.0.3
         distribution: 'temurin'
         cache: 'maven'
     - name: Build with Maven

RCaNconstructor/macaarch64-javafx/README.txt

@@ -0,0 +1,12 @@
+
+These files are the same as those available from:
+
+https://gluonhq.com/products/javafx/
+
+...included here to make it easier to just clone off this repository and immediately
+run the project.
+
+Please note that the JavaFX web libraries - the embedded WebKit browser components,
+are NOT included due to GitHub template size restrictions. You can download those
+from the link above and drop them into your own GitHub repo and they should work
+fine.

RCaNconstructor/pom.xml

@@ -32,11 +32,13 @@
         <!-- Set the project to UTF-8, avoiding warnings in the build logs -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+
+        <!-- needs to be consistent with github actions -->
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
         <!-- Used to set both the path to find the JavaFX modules and also the versions for Maven dependencies -->
-        <javafx.version>16</javafx.version>
+        <javafx.version>22.0.2</javafx.version>
 
         <!-- Replace this UUID with a custom one for your project. This ID is used by the Windows installer system
         to know that an installer is intended to replace/upgrade an earlier version. The easiest thing to do is
@@ -250,7 +252,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.13.0</version>
+                    <configuration>
+                    	<source>21</source> <!-- JDK source version -->
+                    	<target>21</target> <!-- JDK target version -->
+                    	<release>21</release> <!-- Use this for JDK 9+ to ensure API compatibility -->
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -375,16 +382,29 @@
             </build>
         </profile>
         <profile>
-            <id>mac-active</id>
+            <id>macx64-active</id>
             <activation>
                 <os>
                     <family>mac</family>
+                    <arch>x64</arch>
                 </os>
             </activation>
             <properties>
                 <platform>mac</platform>
             </properties>
         </profile>
+        <profile>
+            <id>macaarch64-active</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <platform>macaarch64</platform>
+            </properties>
+        </profile>
     </profiles>
 </project>