Merge branch 'master' into experimental

coronalabs · Nov 4, 2024 · 95d5758 · 95d5758
2 parents 6aca7af + 71609dd
commit 95d5758
Show file tree

Hide file tree

Showing 35 changed files with 654 additions and 325 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,19 +14,23 @@ on:
         description: 'Build Year'
         required: true
         default: '2100'
+      onlyLatest:
+        description: "Only Latest Xcode"
+        type: 'boolean'
+        required: false
+        default: false
 
 
 env:
   WORKSPACE: ${{ github.workspace }}
-  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
   BUILD_NUMBER: ${{ github.event.inputs.buildNumber }}
   YEAR: ${{ github.event.inputs.buildYear }}
 
 
 jobs:
   source-code:
     name: Check out and process source code
-    if: "!contains(github.ref, 'refs/tags/') || github.repository == 'coronalabs/corona'"
     runs-on: macos-12
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
@@ -45,7 +49,7 @@ jobs:
 
   native:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -57,7 +61,7 @@ jobs:
         run: tar -xzf SourceCode/corona.tgz
       - run: ./tools/GHAction/daily_env.sh
       - name: Build Native
-        run: JAVA_HOME="$JAVA_HOME_11_X64" ./tools/GHAction/build_native.sh
+        run: JAVA_HOME="${JAVA_HOME_17_X64:-$JAVA_HOME_17_arm64}" ./tools/GHAction/build_native.sh
         env:
           CERT_PASSWORD: ${{ secrets.CertPassword }}
       - name: Upload Corona Native
@@ -66,14 +70,15 @@ jobs:
           name: Native
           path: ./output
 
-
-  Xcode-template-matrix-13:
+  Xcode-template-matrix-14:
     strategy:
       matrix:
         runner:
-          - macos-13
+          - macos-14
         xcode:
-          - Xcode_15.2
+          - Xcode_16.1
+          - Xcode_16
+          - Xcode_15.4
         target:
           - template
           - template-angle
@@ -109,14 +114,15 @@ jobs:
           name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }}
           path: ./output
 
-  Xcode-template-matrix-12:
+
+  Xcode-template-matrix-13:
+    if: (! github.event.inputs.onlyLatest)
     strategy:
       matrix:
         runner:
-          - macos-12
+          - macos-13
         xcode:
-          - Xcode_13.4.1
-          - Xcode_14.2
+          - Xcode_15.2
         target:
           - template
           - template-angle
@@ -129,9 +135,6 @@ jobs:
       DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
       TEMPLATE_TARGET: ${{ matrix.target }}
       TEMPLATE_PLATFORM: ${{ matrix.platform }}
-      S2D_MIN_VER_IOS: "8.0"
-      S2D_MIN_VER_TVOS: "9.0"
-      S2D_MIN_VER_MACOS: "10.9"
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -155,14 +158,15 @@ jobs:
           name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }}
           path: ./output
 
-
-  Xcode-template-matrix:
+  Xcode-template-matrix-12:
+    if: (! github.event.inputs.onlyLatest)
     strategy:
       matrix:
         runner:
-          - macos-11
+          - macos-12
         xcode:
           - Xcode_13.2.1
+          - Xcode_14.2
         target:
           - template
           - template-angle
@@ -204,10 +208,11 @@ jobs:
 
   collect-ios-templates:
     needs:
-      - Xcode-template-matrix
       - Xcode-template-matrix-12
       - Xcode-template-matrix-13
+      - Xcode-template-matrix-14
     runs-on: ubuntu-20.04
+    if: (! failure() && ! cancelled())
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - uses: actions/checkout@v4
@@ -232,6 +237,8 @@ jobs:
     needs:
       - source-code
     runs-on: macos-13
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Set up emsdk
@@ -380,7 +387,7 @@ jobs:
 
   CoronaCards-iOS:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -407,7 +414,7 @@ jobs:
 
   CoronaCards-iOS-angle:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -441,7 +448,8 @@ jobs:
       - native
       - webtemplate
       - linux
-    runs-on: macos-13
+    if: (! failure() && ! cancelled())
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -494,7 +502,7 @@ jobs:
         run: |
           curl -sL https://github.com/coronalabs/binary-data/releases/download/1.0/jre.macos.tgz -o jre.macos.tgz
       - name: required for appdmg
-        run: python3 -m pip install setuptools
+        run: brew install python-setuptools
       - name: install appdmg
         run: npm install -g appdmg
       - name: install imagemagick
@@ -525,7 +533,7 @@ jobs:
 
 
   check-notarization:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Check notarization credentials
         run: |

diff --git a/platform/android/Rtt_AndroidAppPackager.cpp b/platform/android/Rtt_AndroidAppPackager.cpp
@@ -257,11 +257,11 @@ AndroidAppPackager::Build( AppPackagerParams * params, const char * tmpDirBase )
 			gradleGo.append(" && cd template &&");
 
 #if defined(Rtt_MAC_ENV) || defined(Rtt_LINUX_ENV)
-			bool java11Installed = 0 == system("JAVA_VERSION=11 /usr/bin/java -version > /dev/null 2>/dev/null");
+			bool java11Installed = 0 == system("JAVA_VERSION=17 /usr/bin/java -version > /dev/null 2>/dev/null");
 			if(java11Installed) {
-				gradleGo.append(" ./setup.sh && JAVA_VERSION=11 ./gradlew");
+				gradleGo.append(" ./setup.sh && JAVA_VERSION=17 ./gradlew");
 			} else {
-				Rtt_TRACE_SIM(("WARNING: Java 11 does not seems to be available. If build fails, install Java 1.11."));
+				Rtt_TRACE_SIM(("WARNING: Java 17 does not seems to be available. If build fails, install Java 17"));
 				gradleGo.append(" ./setup.sh && ./gradlew");
 			}
 #else