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
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ jobs:

Check Swift formatting:
macos:
xcode: "16.4"
xcode: "26.2"
resource_class: "m4pro.medium"
steps:
- checkout
Expand All @@ -534,7 +534,7 @@ jobs:

iOS build and test:
macos:
xcode: "16.4"
xcode: "26.2"
resource_class: "m4pro.medium"
steps:
- checkout
Expand All @@ -548,16 +548,16 @@ jobs:
- setup-rust-toolchain
- restore_cache:
name: Restore rubygems cache
key: swift-docs-gems-v22
key: swift-docs-gems-v23
- run:
name: Install jazzy
command: gem install --no-document jazzy
- save_cache:
name: Save rubygems cache
# NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
key: swift-docs-gems-v22
key: swift-docs-gems-v23
paths:
- ~/.rbenv/versions/3.4.3/lib/ruby/gems/3.4.0
- ~/.rbenv/versions/3.4.7/lib/ruby/gems/3.4.0
- run:
name: Setup build environment
command: |
Expand All @@ -573,7 +573,7 @@ jobs:
DEVICES=$(xcrun xctrace list devices 2>&1)
echo "$DEVICES"
# Pick a device and start it
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}')
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26' | awk -F'[()]' '{print $4}')
xcrun simctl boot "$UUID"
# Store build type for use in cache key
if [ -z "${CIRCLE_TAG}" ]; then
Expand Down Expand Up @@ -635,7 +635,7 @@ jobs:

iOS integration test:
macos:
xcode: "16.4"
xcode: "26.2"
resource_class: "m4pro.medium"
steps:
- checkout
Expand All @@ -657,7 +657,7 @@ jobs:
DEVICES=$(xcrun xctrace list devices 2>&1)
echo "$DEVICES"
# Pick a device and start it
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}')
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26' | awk -F'[()]' '{print $4}')
xcrun simctl boot "$UUID"
- run:
name: Build XCFramework archive
Expand All @@ -680,7 +680,7 @@ jobs:

iOS Framework release:
macos:
xcode: "16.4"
xcode: "26.2"
resource_class: "m4pro.medium"
steps:
- checkout
Expand Down Expand Up @@ -923,7 +923,7 @@ jobs:

pypi-macos-release:
macos:
xcode: "16.4"
xcode: "26.2"
resource_class: "m4pro.medium"
steps:
- install-rustup
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Tiny performance improvement for putting tasks on the dispatcher ([#3318](https://github.com/mozilla/glean/pull/3318))
* Instrument the case when the `client_id.txt` file does not exist yet ([#3339](https://github.com/mozilla/glean/pull/3339))
* When a missing client ID in the database is detected, Glean now restores the backup client ID ([#3334](https://github.com/mozilla/glean/pull/3334))
* iOS
* Glean for iOS is now being built with Xcode 26.2 ([#3350](https://github.com/mozilla/glean/pull/3350))

# v66.1.2 (2025-11-25)

Expand Down
2 changes: 1 addition & 1 deletion bin/run-ios-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ xcodebuild \
-workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \
-scheme Glean \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 16' \
-destination 'platform=iOS Simulator,name=iPhone 17' \
build | \
tee raw_xcodebuild.log | \
xcpretty && exit "${PIPESTATUS[0]}"
2 changes: 1 addition & 1 deletion bin/run-ios-sample-app-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ xcodebuild \
-workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace \
-scheme glean-sample-app \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 16' \
-destination 'platform=iOS Simulator,name=iPhone 17' \
build | \
tee raw_sample_xcodebuild.log | \
xcpretty && exit "${PIPESTATUS[0]}"
2 changes: 1 addition & 1 deletion bin/run-ios-sample-app-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ xcodebuild \
-workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace \
-scheme glean-sample-app \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 16' \
-destination 'platform=iOS Simulator,name=iPhone 17' \
test | \
tee raw_sample_xcodetest.log | \
xcpretty && exit "${PIPESTATUS[0]}"
2 changes: 1 addition & 1 deletion bin/run-ios-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ xcodebuild \
-workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \
-scheme Glean \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 16' \
-destination 'platform=iOS Simulator,name=iPhone 17' \
test | \
tee raw_xcodetest.log | \
xcpretty && exit "${PIPESTATUS[0]}"
2 changes: 1 addition & 1 deletion docs/dev/ios/setup-ios-build-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Prepare your build environment

1. Install Xcode 16.4 or higher.
1. Install Xcode 26.2 or higher.
2. Ensure you have Python 3 installed: `brew install python`
3. Install linting and formatting tools: `brew install swiftlint`
4. (Optional, only required for building on the CLI) Install [xcpretty](https://github.com/xcpretty/xcpretty): `gem install xcpretty`
Expand Down
2 changes: 1 addition & 1 deletion samples/ios/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Glean sends a [`baseline`][] ping when the app is sent to background.

## Build

1. Install Xcode 16.4 or higher.
1. Install Xcode 26.2 or higher.

2. Install the latest [Xcode developer tools](https://developer.apple.com/xcode/downloads/) from Apple.

Expand Down