Skip to content

Fixes #140 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 20, 2022
Merged

Fixes #140 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
962b93a
Fixes #140. Seems Apple has bumped the minimum required target to 13.…
May 20, 2022
c1f120d
Fixed the tests as well
May 20, 2022
bf86946
Fixed the naming of the mac catalyst tests
May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/catalyst.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ 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
with:
xcode-version: '13.1'
- 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
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:
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
6 changes: 3 additions & 3 deletions ios.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down