Skip to content
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.

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

Xcode version update #445

Merged
merged 12 commits into from
Mar 28, 2024
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ name: Build
on: [pull_request, workflow_dispatch]
jobs:
cocoapods:
name: CocoaPods (Xcode 14)
name: CocoaPods (Xcode 15.1)
runs-on: macOS-13
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: Run pod lib lint
run: pod lib lint
spm:
name: SPM (Xcode 14)
name: SPM (Xcode 15.1)
runs-on: macOS-13
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: Use current branch
run: sed -i '' 's/branch = .*/branch = \"'"$GITHUB_HEAD_REF"'\";/' SampleApps/SPMTest/SPMTest.xcodeproj/project.pbxproj
- name: Run swift package resolve
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
with:
fetch-depth: 0

- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app

- name: Check for unreleased section in changelog
run: grep "## unreleased" CHANGELOG.md || (echo "::error::No unreleased section found in CHANGELOG"; exit 1)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: Run Unit Tests
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator' test | xcpretty
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 14,OS=17.2,platform=iOS Simulator' test | xcpretty
ui_test_job:
name: UI
runs-on: macOS-13
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: Run UI Tests
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator' test | xcpretty
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 14,OS=17.2,platform=iOS Simulator' test | xcpretty
2 changes: 1 addition & 1 deletion BraintreeDropIn.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.platform = :ios, "12.0"
s.requires_arc = true
s.compiler_flags = "-Wall -Werror -Wextra"
s.swift_version = "5.7"
s.swift_version = "5.9"

s.source_files = "Sources/BraintreeDropIn/**/*.{h,m}"
s.public_header_files = "Sources/BraintreeDropIn/Public/BraintreeDropIn/*.h"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Braintree iOS Drop-in SDK - Release Notes

## unreleased
* Require Xcode 15.0+ and Swift 5.9+ (per [App Store requirements](https://developer.apple.com/news/?id=khzvxn8a))

## 9.11.0 (2024-02-06)
* Add Slovak language support

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Versions 6 and below are unsupported.

## Demo

A demo app is included in this project. Running the demo app requires Xcode 13+. Open BraintreeDropIn.xcworkspace and run the Demo scheme to view it.
A demo app is included in this project. Running the demo app requires Xcode 15.0+. Open BraintreeDropIn.xcworkspace and run the Demo scheme to view it.

The demo app uses Swift Package Manager to fetch dependencies. Xcode will download dependencies automatically when you open the workspace. Deleting derived data will delete the dependencies. Go to **File -> Swift Packages -> Resolve Package Versions** to re-download them.

Expand Down
Loading