From f4d3c57a4c5bc5298a607860d7df259c261b5b63 Mon Sep 17 00:00:00 2001 From: Scott Harrison Date: Thu, 18 Sep 2025 20:01:07 -0400 Subject: [PATCH 1/4] Fixes for Facebook SDK and other Modern Frameworks --- tools/CoronaBuilder/BuilderPluginDownloader.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/CoronaBuilder/BuilderPluginDownloader.lua b/tools/CoronaBuilder/BuilderPluginDownloader.lua index eed8e9e56..6ea0ab25a 100644 --- a/tools/CoronaBuilder/BuilderPluginDownloader.lua +++ b/tools/CoronaBuilder/BuilderPluginDownloader.lua @@ -439,9 +439,9 @@ function DownloadPluginsMain(args, user, buildYear, buildRevision) end else if forceLoad then - config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" \n') + config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" -Xlinker -undefined -Xlinker dynamic_lookup \n') else - config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer\n') + config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer -Xlinker -undefined -Xlinker dynamic_lookup\n') end end From 36eb17309004aad9123d3cd11ddbd52e47496e01 Mon Sep 17 00:00:00 2001 From: Scott Harrison Date: Sat, 20 Sep 2025 00:23:18 -0400 Subject: [PATCH 2/4] Fixes for iOS 26 --- tools/buildsys-ios/libtemplate/Defaults.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/buildsys-ios/libtemplate/Defaults.lua b/tools/buildsys-ios/libtemplate/Defaults.lua index d348a740d..ce7dee3b8 100644 --- a/tools/buildsys-ios/libtemplate/Defaults.lua +++ b/tools/buildsys-ios/libtemplate/Defaults.lua @@ -161,7 +161,6 @@ function M:updateFlags( minVersion ) self.options.flags = { '-ObjC', '-all_load', - '-ld_classic', '-fobjc-link-runtime', '-miphoneos-version-min=' .. minVersion, '-std=c++11', From 02b7bb43091ea94581ad13d7d72d6ec294754ad7 Mon Sep 17 00:00:00 2001 From: Scott Harrison Date: Sat, 20 Sep 2025 14:52:08 -0400 Subject: [PATCH 3/4] Test Xcode 26 --- .github/workflows/build.yml | 53 ++++++++++++++++++++++++++++++++----- platform/mac/AppDelegate.mm | 2 +- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d672f89b1..30fab1e5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,14 +17,14 @@ on: env: WORKSPACE: ${{ github.workspace }} - DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer BUILD_NUMBER: ${{ github.event.inputs.buildNumber }} YEAR: ${{ github.event.inputs.buildYear }} jobs: source-code: name: Check out and process source code - runs-on: macos-13 + runs-on: macos-26 steps: - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR" - uses: actions/checkout@v4 @@ -41,7 +41,7 @@ jobs: native: needs: source-code - runs-on: macos-15 + runs-on: macos-26 steps: - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR" - name: Get processed code @@ -62,6 +62,47 @@ jobs: name: Native path: ./output + Xcode-template-matrix-26: + strategy: + matrix: + runner: + - macos-26 + xcode: + - Xcode_26.0 + target: + - template + - template-angle + platform: + - iphone + - tvos + needs: source-code + runs-on: ${{ matrix.runner }} + env: + DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer + TEMPLATE_TARGET: ${{ matrix.target }} + TEMPLATE_PLATFORM: ${{ matrix.platform }} + steps: + - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR" + - name: Get processed code + uses: actions/download-artifact@v4 + with: + name: SourceCode + path: SourceCode + - name: Unpack source code + run: tar -xzf SourceCode/corona.tgz + - run: ./tools/GHAction/daily_env.sh + - name: Build templates + working-directory: ./platform/${{ matrix.platform }} + run: ./gh_build_templates.sh + env: + CERT_PASSWORD: ${{ secrets.CertPassword }} + - name: Build templates JSON spec + run: ./tools/GHAction/generate_xcode_jsons.py + - name: Upload templates + uses: actions/upload-artifact@v4 + with: + name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }} + path: ./output Xcode-template-matrix-15: strategy: matrix: @@ -307,7 +348,7 @@ jobs: - webtemplate # - linux if: (! failure() && ! cancelled()) - runs-on: macos-15 + runs-on: macos-26 steps: - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR" - name: Get processed code @@ -404,7 +445,7 @@ jobs: exit 1 check-notarization: - runs-on: macos-15 + runs-on: macos-26 steps: - name: Check notarization credentials run: | @@ -428,7 +469,7 @@ jobs: webtemplate: needs: - source-code - runs-on: macos-15 + runs-on: macos-26 env: DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer steps: diff --git a/platform/mac/AppDelegate.mm b/platform/mac/AppDelegate.mm index a30b34458..411f11629 100755 --- a/platform/mac/AppDelegate.mm +++ b/platform/mac/AppDelegate.mm @@ -254,7 +254,7 @@ static void SigPIPEHandler(int signal) NSString *kosVersionMinimum = @"10.9"; // we refuse to run on OSes older than this NSString *kosVersionPrevious = @"10.12"; // should be updated as Apple releases new OSes -NSString *kosVersionCurrent = @"15.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one +NSString *kosVersionCurrent = @"26.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one // These tags are defined on the various DeviceBuild dialogs in Interface Builder enum { From 78b823ff2214551ca6a161642a83a14ccc97fa86 Mon Sep 17 00:00:00 2001 From: Scott Harrison Date: Sat, 20 Sep 2025 14:53:02 -0400 Subject: [PATCH 4/4] Quick Fixes --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30fab1e5e..60824245d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,6 +149,7 @@ jobs: collect-ios-templates: needs: + - Xcode-template-matrix-26 - Xcode-template-matrix-15 runs-on: ubuntu-latest if: (! failure() && ! cancelled())