Skip to content

Commit 56e6e85

Browse files
committed
Swift: Build on Xcode 16.2
1 parent 673a1d3 commit 56e6e85

File tree

9 files changed

+21
-17
lines changed

9 files changed

+21
-17
lines changed

.circleci/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ jobs:
498498

499499
Check Swift formatting:
500500
macos:
501-
xcode: "15.1"
501+
xcode: "16.2"
502502
resource_class: "macos.m1.medium.gen1"
503503
steps:
504504
- checkout
@@ -516,7 +516,7 @@ jobs:
516516
517517
iOS build and test:
518518
macos:
519-
xcode: "15.1"
519+
xcode: "16.2"
520520
resource_class: "macos.m1.medium.gen1"
521521
steps:
522522
- checkout
@@ -529,16 +529,16 @@ jobs:
529529
- setup-rust-toolchain
530530
- restore_cache:
531531
name: Restore rubygems cache
532-
key: swift-docs-gems-v20
532+
key: swift-docs-gems-v21
533533
- run:
534534
name: Install jazzy
535535
command: gem install --no-document jazzy
536536
- save_cache:
537537
name: Save rubygems cache
538538
# NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
539-
key: swift-docs-gems-v20
539+
key: swift-docs-gems-v21
540540
paths:
541-
- ~/.rbenv/versions/3.1.4/lib/ruby/gems/3.1.0
541+
- ~/.rbenv/versions/3.3.5/lib/ruby/gems/3.3.0
542542
- run:
543543
name: Setup build environment
544544
command: |
@@ -554,7 +554,7 @@ jobs:
554554
DEVICES=$(xcrun xctrace list devices 2>&1)
555555
echo "$DEVICES"
556556
# Pick a device and start it
557-
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 15 Simulator (17' | awk -F'[()]' '{print $4}')
557+
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}')
558558
xcrun simctl boot "$UUID"
559559
# Store build type for use in cache key
560560
if [ -z "${CIRCLE_TAG}" ]; then
@@ -616,7 +616,7 @@ jobs:
616616

617617
iOS integration test:
618618
macos:
619-
xcode: "15.1"
619+
xcode: "16.2"
620620
resource_class: "macos.m1.medium.gen1"
621621
steps:
622622
- checkout
@@ -638,7 +638,7 @@ jobs:
638638
DEVICES=$(xcrun xctrace list devices 2>&1)
639639
echo "$DEVICES"
640640
# Pick a device and start it
641-
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 15 Simulator (17' | awk -F'[()]' '{print $4}')
641+
UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}')
642642
xcrun simctl boot "$UUID"
643643
- run:
644644
name: Build XCFramework archive
@@ -661,7 +661,7 @@ jobs:
661661

662662
iOS Framework release:
663663
macos:
664-
xcode: "15.1"
664+
xcode: "16.2"
665665
resource_class: "macos.m1.medium.gen1"
666666
steps:
667667
- checkout
@@ -900,7 +900,7 @@ jobs:
900900
901901
pypi-macos-release:
902902
macos:
903-
xcode: "15.1"
903+
xcode: "16.2"
904904
resource_class: "macos.m1.medium.gen1"
905905
steps:
906906
- install-rustup

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
[Full changelog](https://github.com/mozilla/glean/compare/v65.1.1...main)
44

5+
* Swift
6+
* Glean for iOS is now being built with Xcode 16.2 ([#3189](https://github.com/mozilla/glean/pull/3189))
7+
58
# v65.1.1 (2025-09-16)
69

710
[Full changelog](https://github.com/mozilla/glean/compare/v65.1.0...v65.1.1)

bin/run-ios-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ xcodebuild \
1111
-workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \
1212
-scheme Glean \
1313
-sdk iphonesimulator \
14-
-destination 'platform=iOS Simulator,name=iPhone 15' \
14+
-destination 'platform=iOS Simulator,name=iPhone 16' \
1515
build | \
1616
tee raw_xcodebuild.log | \
1717
xcpretty && exit "${PIPESTATUS[0]}"

bin/run-ios-sample-app-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ xcodebuild \
1111
-workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace \
1212
-scheme glean-sample-app \
1313
-sdk iphonesimulator \
14-
-destination 'platform=iOS Simulator,name=iPhone 15' \
14+
-destination 'platform=iOS Simulator,name=iPhone 16' \
1515
build | \
1616
tee raw_sample_xcodebuild.log | \
1717
xcpretty && exit "${PIPESTATUS[0]}"

bin/run-ios-sample-app-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ xcodebuild \
1111
-workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace \
1212
-scheme glean-sample-app \
1313
-sdk iphonesimulator \
14-
-destination 'platform=iOS Simulator,name=iPhone 15' \
14+
-destination 'platform=iOS Simulator,name=iPhone 16' \
1515
test | \
1616
tee raw_sample_xcodetest.log | \
1717
xcpretty && exit "${PIPESTATUS[0]}"

bin/run-ios-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ xcodebuild \
1111
-workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \
1212
-scheme Glean \
1313
-sdk iphonesimulator \
14-
-destination 'platform=iOS Simulator,name=iPhone 15' \
14+
-destination 'platform=iOS Simulator,name=iPhone 16' \
1515
test | \
1616
tee raw_xcodetest.log | \
1717
xcpretty && exit "${PIPESTATUS[0]}"

bin/update-xcode-version.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ run rm "${WORKSPACE_ROOT}/${FILE}.bak"
5959
# Reminder to add a changelog entry
6060
run echo "Updated Xcode to version ${NEW_VERSION_MAJOR_MINOR}"
6161
run echo "Please add the following to the CHANGELOG.md under the unrelased section for iOS:"
62-
run echo "'* Glean for iOS is now being built with Xcode 15.1 ([<pull request #>](<pull request URL>))'"
62+
echo
63+
run echo "* Glean for iOS is now being built with Xcode ${NEW_VERSION} ([<pull request #>](<pull request URL>))'"

docs/dev/ios/setup-ios-build-environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Prepare your build environment
44

5-
1. Install Xcode 15.0 or higher.
5+
1. Install Xcode 16.2 or higher.
66
2. Ensure you have Python 3 installed: `brew install python`
77
3. Install linting and formatting tools: `brew install swiftlint`
88
4. (Optional, only required for building on the CLI) Install [xcpretty](https://github.com/xcpretty/xcpretty): `gem install xcpretty`

samples/ios/app/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Glean sends a [`baseline`][] ping when the app is sent to background.
99

1010
## Build
1111

12-
1. Install Xcode 15.0 or higher.
12+
1. Install Xcode 16.2 or higher.
1313

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

0 commit comments

Comments
 (0)