diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d61d81df..a8676bbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e3b11e8..f74f35f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a5d6ebd2..e3c4fc15 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 diff --git a/BraintreeDropIn.podspec b/BraintreeDropIn.podspec index fc2f226a..8188f416 100644 --- a/BraintreeDropIn.podspec +++ b/BraintreeDropIn.podspec @@ -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" diff --git a/CHANGELOG.md b/CHANGELOG.md index ee890498..e79745df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/README.md b/README.md index 0da3abab..d2edcb51 100644 --- a/README.md +++ b/README.md @@ -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.