From 962b93a12ce62bb50f7ff23a2185e85273d90ffa Mon Sep 17 00:00:00 2001 From: Alexander Widerberg Date: Fri, 20 May 2022 09:53:36 +0200 Subject: [PATCH 1/3] Fixes #140. Seems Apple has bumped the minimum required target to 13.1 in newer versions of Xcode for Mac Catalyst. --- ios.toolchain.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios.toolchain.cmake b/ios.toolchain.cmake index 1ecfd25..2b3d0d8 100644 --- a/ios.toolchain.cmake +++ b/ios.toolchain.cmake @@ -245,14 +245,14 @@ if(NOT DEFINED DEPLOYMENT_TARGET) set(DEPLOYMENT_TARGET "11.0") elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64") # Unless specified, SDK version 13.0 is used by default as minimum target version (mac catalyst minimum requirement). - set(DEPLOYMENT_TARGET "13.0") + set(DEPLOYMENT_TARGET "13.1") else() # Unless specified, SDK version 11.0 is used by default as minimum target version (iOS, tvOS). set(DEPLOYMENT_TARGET "11.0") endif() message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!") -elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM MATCHES "^MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.0") - message(FATAL_ERROR "Mac Catalyst builds requires a minimum deployment target of 13.0!") +elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM MATCHES "^MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.1") + message(FATAL_ERROR "Mac Catalyst builds requires a minimum deployment target of 13.1!") endif() # Store the DEPLOYMENT_TARGET in the cache From c1f120db77e07f7707cb7a149f73789dcbc0f315 Mon Sep 17 00:00:00 2001 From: Alexander Widerberg Date: Fri, 20 May 2022 10:03:01 +0200 Subject: [PATCH 2/3] Fixed the tests as well --- .github/workflows/catalyst.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/catalyst.yml b/.github/workflows/catalyst.yml index 40da72c..06a9831 100644 --- a/.github/workflows/catalyst.yml +++ b/.github/workflows/catalyst.yml @@ -8,11 +8,11 @@ on: jobs: build_with_13_1_MAC_CATALYST: - name: "Xcode version 13.1, Target macOS Catalyst on Apple Silicon [arm64] Target SDK 13.0" + name: "Xcode version 13.1, Target macOS Catalyst on Intel CPUs [x86_64] Target SDK 13.1" runs-on: macos-11 env: PLATFORM: MAC_CATALYST - DEPLOYMENT_TARGET: "13.0" + DEPLOYMENT_TARGET: "13.1" steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 @@ -21,15 +21,15 @@ jobs: - name: Build run: ./.github/build.sh build_with_13_1_MAC_CATALYST_ARM64: - name: "Xcode version 13.2, Target macOS Catalyst on Intel CPUs [x86_64] Target SDK 13.0" - runs-on: macos-11 + name: "Xcode version 13.4, Target macOS Catalyst on Apple Silicon [arm64] Target SDK 13.1" + runs-on: macos-12 env: PLATFORM: MAC_CATALYST_ARM64 - DEPLOYMENT_TARGET: "13.0" + DEPLOYMENT_TARGET: "13.1" steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.2' + xcode-version: '13.4' - name: Build run: ./.github/build.sh \ No newline at end of file From bf8694686a9bce0777b72b6d148d8d89ed55cc86 Mon Sep 17 00:00:00 2001 From: Alexander Widerberg Date: Fri, 20 May 2022 10:03:44 +0200 Subject: [PATCH 3/3] Fixed the naming of the mac catalyst tests --- .github/workflows/catalyst.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/catalyst.yml b/.github/workflows/catalyst.yml index 06a9831..fb27d6a 100644 --- a/.github/workflows/catalyst.yml +++ b/.github/workflows/catalyst.yml @@ -20,7 +20,7 @@ jobs: xcode-version: '13.1' - name: Build run: ./.github/build.sh - build_with_13_1_MAC_CATALYST_ARM64: + build_with_13_4_MAC_CATALYST_ARM64: name: "Xcode version 13.4, Target macOS Catalyst on Apple Silicon [arm64] Target SDK 13.1" runs-on: macos-12 env: