diff --git a/.github/workflows/catalyst.yml b/.github/workflows/catalyst.yml index fb27d6a..69d590b 100644 --- a/.github/workflows/catalyst.yml +++ b/.github/workflows/catalyst.yml @@ -21,8 +21,8 @@ jobs: - name: Build run: ./.github/build.sh 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 + name: "Xcode version 15.0, Target macOS Catalyst on Apple Silicon [arm64] Target SDK 13.1" + runs-on: macos-13 env: PLATFORM: MAC_CATALYST_ARM64 DEPLOYMENT_TARGET: "13.1" @@ -30,6 +30,6 @@ jobs: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.4' + xcode-version: '15.0' - name: Build run: ./.github/build.sh \ No newline at end of file diff --git a/.github/workflows/combined.yml b/.github/workflows/combined.yml index e3703d2..898a631 100644 --- a/.github/workflows/combined.yml +++ b/.github/workflows/combined.yml @@ -7,63 +7,63 @@ on: types: [ opened, synchronize ] jobs: - build_with_12_5_1_OS64COMBINED: - name: "Xcode version 13.1, Target iOS Combined [x86_64, arm64] Target SDK 12.0" - runs-on: macos-11 + build_with_15_0_OS64COMBINED: + name: "Xcode version 15.0, Target iOS Combined [x86_64, arm64] Target SDK 15.0" + runs-on: macos-13 env: PLATFORM: OS64COMBINED USE_NEW_BUILD: 1 - DEPLOYMENT_TARGET: "12.0" + DEPLOYMENT_TARGET: "15.0" USE_XCODE: 1 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh - build_with_12_5_1_WATCHOSCOMBINED: - name: "Xcode version 13.1, Target watchOS Combined [armv7k, arm64_32, x86_64] Target SDK 5.0" - runs-on: macos-11 + build_with_15_0_WATCHOSCOMBINED: + name: "Xcode version 15.0, Target watchOS Combined [armv7k, arm64_32, x86_64] Target SDK 7.0" + runs-on: macos-13 env: PLATFORM: WATCHOSCOMBINED USE_NEW_BUILD: 1 - DEPLOYMENT_TARGET: "5.0" + DEPLOYMENT_TARGET: "7.0" USE_XCODE: 1 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh - build_with_12_5_1_TVOSCOMBINED: - name: "Xcode version 13.1, Target tvOS Combined [arm64, x86_64] Target SDK 11.0" - runs-on: macos-11 + build_with_15_0_TVOSCOMBINED: + name: "Xcode version 15.0, Target tvOS Combined [arm64, x86_64] Target SDK 14.0" + runs-on: macos-13 env: PLATFORM: TVOSCOMBINED USE_NEW_BUILD: 1 - DEPLOYMENT_TARGET: "11.0" + DEPLOYMENT_TARGET: "14.0" USE_XCODE: 1 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh - build_with_13_1_OS64_LIBCURL: - name: "Xcode version 13.1, Target iOS [arm64, x86_64] Target SDK 14.0 [libCURL example]" - runs-on: macos-11 + build_with_15_0_OS64_LIBCURL: + name: "Xcode version 15.0, Target iOS [arm64, x86_64] Target SDK 17.0 [libCURL example]" + runs-on: macos-13 env: PLATFORM: OS64COMBINED - DEPLOYMENT_TARGET: "14.0" + DEPLOYMENT_TARGET: "17.0" USE_XCODE: 1 BUILD_CURL: 1 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh \ No newline at end of file diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 2852825..0262610 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -7,43 +7,43 @@ on: types: [ opened, synchronize ] jobs: - build_with_11_7_0_OS: - name: "Xcode version 11.7.0, Target iOS [arm64] Target SDK 9.0" - runs-on: macos-11 + build_with_15_0_OS: + name: "Xcode version 11.7.0, Target iOS [arm64] Target SDK 14.0" + runs-on: macos-13 env: PLATFORM: OS64 - DEPLOYMENT_TARGET: 9.0 + DEPLOYMENT_TARGET: 14.0 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '11.7.0' + xcode-version: '15.0' - name: Build run: ./.github/build.sh - build_with_11_7_0_SIMULATOR64: - name: "Xcode version 11.7.0, Target iOS Simulator [x86_64] Target SDK 11.0" - runs-on: macos-11 + build_with_15_0_SIMULATOR64: + name: "Xcode version 15.0, Target iOS Simulator [x86_64] Target SDK 14.0" + runs-on: macos-13 env: PLATFORM: SIMULATOR64 - DEPLOYMENT_TARGET: 11.0 + DEPLOYMENT_TARGET: 14.0 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '11.7.0' + xcode-version: '14.3.1' - name: Build run: ./.github/build.sh - build_with_11_7_0_SIMULATORARM64: - name: "Xcode version 12.5.1, Target iOS Simulator [arm64] Target SDK 11.0" - runs-on: macos-11 + build_with_15_0_SIMULATORARM64: + name: "Xcode version 15.0, Target iOS Simulator [arm64] Target SDK 16.0" + runs-on: macos-13 env: PLATFORM: SIMULATORARM64 - DEPLOYMENT_TARGET: 11.0 + DEPLOYMENT_TARGET: 16.0 steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '12.5.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh build_with_11_7_0_OS64: @@ -73,7 +73,7 @@ jobs: - name: Build run: ./.github/build.sh build_with_latest_OS64: - name: "Xcode version 12.5.1, Target iOS [arm64]" + name: "Xcode version [latest stable], Target iOS [arm64]" runs-on: macos-latest env: PLATFORM: OS64 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 74b3aed..153b361 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -7,9 +7,9 @@ on: types: [ opened, synchronize ] jobs: - build_with_12_5_1_MAC: - name: "Xcode version 12.5.1, Target macOS [x86_64] Target SDK 10.13" - runs-on: macos-11 + build_with_15_0_MAC: + name: "Xcode version 15.0, Target macOS [x86_64] Target SDK 10.13" + runs-on: macos-13 env: PLATFORM: MAC DEPLOYMENT_TARGET: "10.13" @@ -17,20 +17,17 @@ jobs: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '12.5.1' + xcode-version: '15.0' - name: Build run: ./.github/build.sh - build_with_13_2_MAC: - name: "Xcode version 13.2, Target macOS [arm64] Target SDK 11.0 [shared example]" - runs-on: macos-12 + build_with_latest_MAC: + name: "Xcode version [latest supported], Target macOS [arm64] Target SDK 11.0 [shared example]" + runs-on: macos-latest env: PLATFORM: MAC_ARM64 DEPLOYMENT_TARGET: "11.0" BUILD_SHARED: 1 steps: - uses: actions/checkout@v2 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '13.2' - name: Build run: ./.github/build.sh \ No newline at end of file diff --git a/.github/workflows/tvos.yml b/.github/workflows/tvos.yml index 8787ed1..f526c35 100644 --- a/.github/workflows/tvos.yml +++ b/.github/workflows/tvos.yml @@ -7,16 +7,16 @@ on: types: [ opened, synchronize ] jobs: - build_with_11_7_0_TVOS: - name: "Xcode version 11.7.0, Target tvOS [arm64] Target SDK 11.0" - runs-on: macos-11 + build_with_15_0_TVOS: + name: "Xcode version 15.0, Target tvOS [arm64] Target SDK 14.0" + runs-on: macos-13 env: PLATFORM: TVOS - DEPLOYMENT_TARGET: "11.0" + DEPLOYMENT_TARGET: "14.0" steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '11.7.0' + xcode-version: '15.0' - name: Build run: ./.github/build.sh \ No newline at end of file diff --git a/.github/workflows/visionos.yml b/.github/workflows/visionos.yml index 7cdc963..bf720c6 100644 --- a/.github/workflows/visionos.yml +++ b/.github/workflows/visionos.yml @@ -9,7 +9,7 @@ on: jobs: build_with_15_OS: name: "Xcode version 15.0.0, Target visionOS [arm64] Target SDK 1.0" - runs-on: macos-latest + runs-on: macos-13 env: PLATFORM: VISIONOS DEPLOYMENT_TARGET: 1.0 @@ -19,10 +19,11 @@ jobs: with: xcode-version: '15.0' - name: Build + continue-on-error: true run: ./.github/build.sh build_with_15_SIMULATOR64: name: "Xcode version 15.0.0, Target visionOS Simulator [x86_64] Target SDK 1.0" - runs-on: macos-latest + runs-on: macos-13 env: PLATFORM: SIMULATOR64_VISIONOS DEPLOYMENT_TARGET: 1.0 @@ -32,10 +33,11 @@ jobs: with: xcode-version: '15.0' - name: Build + continue-on-error: true run: ./.github/build.sh build_with_15_SIMULATOR_VISIONOS: name: "Xcode version 15.0.0, Target visionOS Simulator [arm64] Target SDK 1.0" - runs-on: macos-latest + runs-on: macos-13 env: PLATFORM: SIMULATOR_VISIONOS DEPLOYMENT_TARGET: 1.0 @@ -45,5 +47,6 @@ jobs: with: xcode-version: '15.0' - name: Build + continue-on-error: true run: ./.github/build.sh diff --git a/.github/workflows/watchos.yml b/.github/workflows/watchos.yml index c82f742..9c19009 100644 --- a/.github/workflows/watchos.yml +++ b/.github/workflows/watchos.yml @@ -7,17 +7,17 @@ on: types: [ opened, synchronize ] jobs: - build_with_11_7_0_WATCHOS: - name: "Xcode version 11.7.0, Target tvOS [armv7k, arm64_32] Target SDK 5.0" - runs-on: macos-11 + build_with_15_0_WATCHOS: + name: "Xcode version 15.0, Target tvOS [armv7k, arm64_32] Target SDK 7.0" + runs-on: macos-13 env: PLATFORM: WATCHOS - DEPLOYMENT_TARGET: "5.0" + DEPLOYMENT_TARGET: "7.0" steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '11.7.0' + xcode-version: '15.0' - name: Build run: ./.github/build.sh build_with_12_5_1_SIMULATOR_WATCHOS: diff --git a/ios.toolchain.cmake b/ios.toolchain.cmake index 0758f40..3790141 100644 --- a/ios.toolchain.cmake +++ b/ios.toolchain.cmake @@ -88,7 +88,7 @@ # CMAKE_OSX_SYSROOT, but can also be manually specified (although this should # not be required). # -# DEPLOYMENT_TARGET: Minimum SDK version to target. Default 2.0 on watchOS and 9.0 on tvOS+iOS +# DEPLOYMENT_TARGET: Minimum SDK version to target. Default 6.0 on watchOS, 13.0 on tvOS+iOS/iPadOS, 11.0 on macOS, 1.0 on visionOS # # NAMED_LANGUAGE_SUPPORT: # ON (default) = Will require "enable_language(OBJC) and/or enable_language(OBJCXX)" for full OBJC|OBJCXX support @@ -259,10 +259,10 @@ set(NAMED_LANGUAGE_SUPPORT_INT ${NAMED_LANGUAGE_SUPPORT} CACHE BOOL if(NOT DEFINED DEPLOYMENT_TARGET) if (PLATFORM MATCHES "WATCHOS") # Unless specified, SDK version 4.0 is used by default as minimum target version (watchOS). - set(DEPLOYMENT_TARGET "4.0") + set(DEPLOYMENT_TARGET "6.0") elseif(PLATFORM STREQUAL "MAC") # Unless specified, SDK version 10.13 (High Sierra) is used by default as the minimum target version (macos). - set(DEPLOYMENT_TARGET "10.13") + set(DEPLOYMENT_TARGET "11.0") elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "SIMULATOR64_VISIONOS") # Unless specified, SDK version 1.0 is used by default as minimum target version (visionOS). set(DEPLOYMENT_TARGET "1.0") @@ -277,7 +277,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET) set(DEPLOYMENT_TARGET "13.1") else() # Unless specified, SDK version 11.0 is used by default as the minimum target version (iOS, tvOS). - set(DEPLOYMENT_TARGET "11.0") + set(DEPLOYMENT_TARGET "13.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.1")