Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/abtesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS, macOS, watchOS, catalyst]
include:
- os: iOS
Expand Down Expand Up @@ -72,7 +72,9 @@ jobs:
TEST: ${{ matrix.test }}
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# TODO: Re-enable when ODM2 catalyst support is investigated
# os: [iOS, catalyst, tvOS, macOS]
os: [iOS, tvOS, macOS]
xcode: ["16.4"]
xcode: ["26.2"]
include:
- os: iOS
device: iPhone 16
Expand All @@ -64,7 +64,7 @@ jobs:
DIR: analytics
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/authentication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
SCHEME: AuthenticationExample
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

- name: Cache Mint packages
uses: actions/cache@v4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ env.MINT_PATH }}
key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:
TEST: true
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd config
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/crashlytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS, macOS, watchOS]
include:
- os: iOS
Expand All @@ -59,7 +59,9 @@ jobs:
TEST: ${{ matrix.test }}
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:
SCHEME: DatabaseExample
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand All @@ -56,7 +58,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
Expand All @@ -77,7 +79,9 @@ jobs:
TEST: ${{ matrix.test }}
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:
SCHEME: FirestoreExample
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd firestore
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
Expand All @@ -53,7 +53,9 @@ jobs:
TEST: false
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/inappmessaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ jobs:
TEST: false
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd inappmessaging
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/installations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ jobs:
DIR: installations
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd installations
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/messaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ jobs:
DIR: messaging
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd messaging
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:
SCHEME: PerformanceExample (iOS)
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
- name: Setup
run: |
cd performance
Expand All @@ -56,7 +58,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS]
include:
- os: iOS
Expand All @@ -77,7 +79,9 @@ jobs:
SCHEME: ${{ matrix.scheme }}
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: macOS-15
strategy:
matrix:
xcode: ["16.4"]
xcode: ["26.2"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
Expand All @@ -53,7 +53,9 @@ jobs:
TEST: false
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Setup
run: |
gem install xcpretty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
import AVFoundation
import OSLog

#if compiler(<6.2)
extension AVAudioSession.CategoryOptions {
static let allowBluetoothHFP = AVAudioSession.CategoryOptions.allowBluetooth
}
#endif

/// Controls audio playback and recording.
actor AudioController {
private var logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "generative-ai")
Expand Down
8 changes: 1 addition & 7 deletions scripts/build-for-testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ xcode_version=$(xcodebuild -version | grep Xcode)
xcode_version="${xcode_version/Xcode /}"
xcode_major="${xcode_version/.*/}"

if [[ "$xcode_major" -ge 26 ]]; then
iphone_version="17"
elif [[ "$xcode_major" -ge 16 ]]; then
iphone_version="16"
else
if [[ "$xcode_major" -lt 26 ]]; then
echo "Unsupported Xcode version $xcode_version; exiting." 1>&2
exit 1
fi
Expand All @@ -42,9 +38,7 @@ if [[ -z "${SPM:-}" ]]; then
fi
if [[ -z "${OS:-}" ]]; then
OS=iOS
DEVICE="iPhone ${iphone_version}"
echo "Defaulting to OS=$OS"
echo "Defaulting to DEVICE=$DEVICE"
fi

# Set have_secrets to true or false.
Expand Down
16 changes: 5 additions & 11 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,7 @@ xcode_version=$(xcodebuild -version | grep Xcode)
xcode_version="${xcode_version/Xcode /}"
xcode_major="${xcode_version/.*/}"

if [[ "$xcode_major" -ge 26 ]]; then
iphone_version="17 Pro"
ios_version="26.1"
elif [[ "$xcode_major" -ge 16 ]]; then
iphone_version="16 Pro"
ios_version="18.6"
else
if [[ "$xcode_major" -lt 26 ]]; then
echo "Unsupported Xcode version $xcode_version; exiting." 1>&2
exit 1
fi
Expand All @@ -42,8 +36,10 @@ if [[ -z "${SPM:-}" ]]; then
fi
if [[ -z "${OS:-}" ]]; then
OS=iOS
DEVICE="iPhone ${iphone_version}"
echo "Defaulting to OS=$OS"
fi
if [[ -z "${DEVICE:-}" && "$OS" == "iOS" ]]; then
DEVICE="iPhone 17 Pro"
echo "Defaulting to DEVICE=$DEVICE"
fi
Comment thread
andrewheard marked this conversation as resolved.
if [[ -z "${TEST:-}" ]]; then
Expand Down Expand Up @@ -153,8 +149,6 @@ function xcb() {
}

# Run xcodebuild
if [[ "${GITHUB_ACTIONS:-}" == "true" ]]; then
sudo xcode-select -s "/Applications/Xcode_${xcode_version}.app/Contents/Developer"
fi
xcode-select -p
xcb "${flags[@]}"
echo "$message"
Loading