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.

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

[V7] Update workflows to use Xcode 16.2.0 + Swift Version 5.10 #1501

Open
wants to merge 13 commits into
base: v7
Choose a base branch
from
+29 −40
Open

[V7] Update workflows to use Xcode 16.2.0 + Swift Version 5.10 #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18fa79b
Bump Braintree.podspec and Package.swift to 5.10
richherrera Jan 14, 2025
ad62b81
Update workflows to use Xcode 16
richherrera Jan 14, 2025
9e70bac
Update workflows to use xcode 16.2.0
richherrera Jan 14, 2025
9176d0c
Update test workflow os version
richherrera Jan 15, 2025
da39a70
Test sdk name
richherrera Jan 15, 2025
983444e
Test path instead of symlink
richherrera Jan 15, 2025
d4e4a92
Test name iphone 18.1
richherrera Jan 15, 2025
2dccc7b
Test sdk iphonesimulator18.1
richherrera Jan 15, 2025
f09a640
Revert sdk config and use macos-15-xlarge
richherrera Jan 15, 2025
0f612f0
Test iphone 16 name and 18.2 os
richherrera Jan 15, 2025
ce77e5c
Update all tests to use macos-15-xlarge
richherrera Jan 15, 2025
493adf6
Update release.yml to use macos-15-xlarge
richherrera Jan 15, 2025
63ffa3d
Update build.yml to use macos-15-xlarge
richherrera Jan 15, 2025
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
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ concurrency:
cancel-in-progress: true
jobs:
cocoapods:
name: CocoaPods (Xcode 15.0.1)
runs-on: macOS-14-xlarge
name: CocoaPods (Xcode 16.2.0)
runs-on: macOS-15-xlarge
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.app
- name: Install CocoaPod dependencies
run: pod install
- name: Run pod lib lint
run: pod lib lint
carthage:
name: Carthage (Xcode 15.0.1)
runs-on: macOS-14-xlarge
name: Carthage (Xcode 16.2.0)
runs-on: macOS-15-xlarge
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.app
- name: Remove SPMTest
run: |
git checkout $GITHUB_HEAD_REF
Expand All @@ -47,16 +47,16 @@ jobs:
- name: Build CarthageTest
run: xcodebuild -project 'SampleApps/CarthageTest/CarthageTest.xcodeproj' -scheme 'CarthageTest' clean build CODE_SIGNING_ALLOWED=NO
spm:
name: SPM (Xcode 15.0.1)
runs-on: macOS-14-xlarge
name: SPM (Xcode 16.2.0)
runs-on: macOS-15-xlarge
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
jobs:
release:
name: Release
runs-on: macOS-14-xlarge
runs-on: macOS-15-xlarge
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.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
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,50 @@ concurrency:
jobs:
unit_test_job:
name: Unit
runs-on: macOS-14-xlarge
runs-on: macOS-15-xlarge
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.app
- name: Install Package dependencies
run: swift package resolve
- name: Install CocoaPod dependencies
run: pod install
- name: Run Unit Tests
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 15,OS=17.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 16,OS=18.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
ui_test_job:
name: UI
runs-on: macOS-14-xlarge
runs-on: macOS-15-xlarge
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.app
- name: Install CocoaPod dependencies
run: pod install
- name: Run UI Tests
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Release' -scheme 'UITests' -destination 'name=iPhone 15,OS=17.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Release' -scheme 'UITests' -destination 'name=iPhone 16,OS=18.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
integration_test_job:
name: Integration
runs-on: macOS-14-xlarge
runs-on: macOS-15-xlarge
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Use Xcode 15.0.1
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
- name: Use Xcode 16.2.0
run: sudo xcode-select -switch /Applications/Xcode_16.2.0.app
- name: Install Package dependencies
run: swift package resolve
- name: Install CocoaPod dependencies
run: pod install
- name: Run Integration Tests
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Release' -scheme 'IntegrationTests' -destination 'name=iPhone 15,OS=17.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
run: set -o pipefail && xcodebuild -workspace 'Braintree.xcworkspace' -sdk 'iphonesimulator' -configuration 'Release' -scheme 'IntegrationTests' -destination 'name=iPhone 16,OS=18.2,platform=iOS Simulator' test | ./Pods/xcbeautify/xcbeautify
2 changes: 1 addition & 1 deletion Braintree.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Pod::Spec.new do |s|

s.platform = :ios, "16.0"
s.compiler_flags = "-Wall -Werror -Wextra"
s.swift_version = "5.9"
s.swift_version = "5.10"

s.default_subspecs = %w[Core Card PayPal]

Expand Down
11 changes: 0 additions & 11 deletions Braintree.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,6 @@
ReferencedContainer = "container:Braintree.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9CE5179A282D54030013C740"
BuildableName = "BraintreePayPalNativeCheckoutTests.xctest"
BlueprintName = "BraintreePayPalNativeCheckoutTests"
ReferencedContainer = "container:Braintree.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down
Loading