Skip to content

Commit

Permalink
chore: Bump minimum Xcode version to 13
Browse files Browse the repository at this point in the history
  • Loading branch information
philipphofmann committed Dec 5, 2022
1 parent b9c9598 commit d4a2978
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 800 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,6 @@ jobs:
path: |
${{ github.workspace }}/*.zip
# The framework requires Xcode 12
build-framework:
name: Build & Validate Framework
runs-on: macos-11
steps:
- uses: actions/checkout@v3
- run: ./scripts/ci-select-xcode.sh 12.5.1
- run: make build-framework
shell: sh
- run: make build-framework-sample
shell: sh

- name: Archiving Framework.zip
uses: actions/upload-artifact@v3
with:
name: ${{ github.sha }}
if-no-files-found: error
path: |
${{ github.workspace }}/*.zip
# Use github.event.pull_request.head.sha instead of github.sha when available as
# the github.sha is be the pre merge commit id for PRs.
# See https://github.jparrowsec.cnmunity/t/github-sha-isnt-the-value-expected/17903/17906.
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ jobs:
# iOS 14
- runs-on: macos-11
platform: 'iOS'
xcode: '12.5.1'
test-destination-os: 'latest'
xcode: '13.2.1'
test-destination-os: '14.5'
timeout-minutes: 15

# iOS 15
Expand All @@ -112,7 +112,7 @@ jobs:
# macOS 11
- runs-on: macos-11
platform: 'macOS'
xcode: '12.5.1'
xcode: '13.2.1'
test-destination-os: 'latest'
timeout-minutes: 15

Expand All @@ -132,6 +132,8 @@ jobs:
test-destination-os: 'latest'
timeout-minutes: 15

# MetricKit doesn't exist for tvOS, so we can still run unit tests with
# Xcode 12 for it.
# tvOS 14
- runs-on: macos-11
platform: 'tvOS'
Expand Down Expand Up @@ -173,6 +175,14 @@ jobs:
sudo ln -s /Applications/Xcode_11.7.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 13.7.simruntime
xcrun simctl create custom-test-device "iPhone 8" "com.apple.CoreSimulator.SimRuntime.iOS-13-7"
# Workaround with a symlink pointed out in: https://github.com/actions/virtual-environments/issues/551#issuecomment-637344435
- name: Prepare iOS 14.5 simulator
if: ${{ matrix.platform == 'iOS' && matrix.test-destination-os == '14.5'}}
run: |
sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
sudo ln -s /Applications/Xcode_12.5.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 14.5.simruntime
xcrun simctl create custom-test-device "iPhone 8" "com.apple.CoreSimulator.SimRuntime.iOS-14-5"
- name: Running tests
# We call a script with the platform so the destination
# passed to xcodebuild doesn't end up in the job name,
Expand Down Expand Up @@ -288,9 +298,9 @@ jobs:
xcode: '13.4.1'
device: 'iPhone 8 (15.2)'

- runs-on: macos-11
xcode: '12.5.1'
device: 'iPhone 8 (14.5)'
- runs-on: macos-12
xcode: '14.1'
device: 'iPhone 8 (16.1)'

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ This version adds a dependency on Swift.
- Rename `SentryOptions.enableFileIOTracking` to `enableFileIOTracing`
- Rename `SentryOptions.enableCoreDataTracking` to `enableCoreDataTracing`
- SentrySDK.close calls flush, which is a blocking call (#2453)
- Bump minimum Xcode version to 13 (#2483)

## 7.31.3

Expand Down
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@ build-xcframework-sample:
cd Samples/Carthage-Validation/XCFramework/ && carthage update --use-xcframeworks
xcodebuild -project "Samples/Carthage-Validation/XCFramework/XCFramework.xcodeproj" -configuration Release CODE_SIGNING_ALLOWED="NO" build

# Building the .frameworsk.zip only works with Xcode 12, as there is no workaround yet for Xcode 13.
build-framework:
@echo "--> Carthage: creating Sentry framework"
./scripts/carthage-xcode12-workaround.sh build --no-skip-current
./scripts/carthage-xcode12-workaround.sh archive Sentry --output Sentry.framework.zip

build-framework-sample:
./scripts/create-carthage-json.sh
cd Samples/Carthage-Validation/Framework/ && carthage update
xcodebuild -project "Samples/Carthage-Validation/Framework/Framework.xcodeproj" -configuration Release CODE_SIGNING_ALLOWED="NO" build

## Build Sentry as a XCFramework that can be used with watchOS and save it to
## the watchOS sample.
watchOSLibPath = ./Samples/watchOS-Swift/libs
Expand Down
1 change: 0 additions & 1 deletion Samples/Carthage-Validation/Framework/Cartfile

This file was deleted.

Loading

0 comments on commit d4a2978

Please sign in to comment.