Skip to content

Commit e85ae21

Browse files
Merge pull request #2581 from DataDog/maxep/xcode26
Build on Xcode 26 Co-authored-by: maxep <maxime.epain@datadoghq.com>
2 parents 8a197c9 + 3594686 commit e85ae21

File tree

17 files changed

+384
-300
lines changed

17 files changed

+384
-300
lines changed

.gitlab-ci.yml

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ variables:
1515
MAIN_BRANCH: "master"
1616
DEVELOP_BRANCH: "develop"
1717
# Default Xcode and runtime versions for all jobs:
18-
DEFAULT_XCODE: "16.2.0"
19-
DEFAULT_IOS_OS: "18.3.1"
20-
DEFAULT_TVOS_OS: "18.2"
18+
DEFAULT_XCODE: "26.0.0"
19+
DEFAULT_IOS_OS: "26.0.1"
20+
DEFAULT_TVOS_OS: "26.0"
2121
# Prefilled variables for running a pipeline manually:
2222
# Ref.: https://docs.gitlab.com/ee/ci/pipelines/index.html#prefill-variables-in-manual-pipelines
2323
RELEASE_GIT_TAG:
@@ -28,7 +28,7 @@ variables:
2828

2929
default:
3030
tags:
31-
- macos:sonoma
31+
- macos:sequoia-arm64
3232
- specific:true
3333

3434
# ┌───────────────┐
@@ -142,7 +142,7 @@ Unit Tests (iOS):
142142
- "Build Dependencies"
143143
variables:
144144
PLATFORM: "iOS Simulator"
145-
DEVICE: "iPhone 16 Pro"
145+
DEVICE: "iPhone 17 Pro"
146146
script:
147147
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE"
148148
- make clean repo-setup ENV=ci
@@ -172,7 +172,7 @@ UI Tests:
172172
- "Build Dependencies"
173173
variables:
174174
PLATFORM: "iOS Simulator"
175-
DEVICE: "iPhone 16 Pro"
175+
DEVICE: "iPhone 17 Pro"
176176
parallel:
177177
matrix:
178178
- TEST_PLAN:
@@ -238,7 +238,7 @@ Smoke Tests (iOS):
238238
<<: *dd-octo-sts-id-token
239239
variables:
240240
PLATFORM: "iOS Simulator"
241-
DEVICE: "iPhone 16 Pro"
241+
DEVICE: "iPhone 17 Pro"
242242
script:
243243
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --ssh
244244
- make clean repo-setup ENV=ci
@@ -259,7 +259,7 @@ Smoke Tests (tvOS):
259259
- make clean repo-setup ENV=ci
260260
- make smoke-test-tvos-all OS="$DEFAULT_TVOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE"
261261

262-
SPM Build (Swift 5.10):
262+
SPM Build (Swift 6.2):
263263
stage: smoke-test
264264
rules:
265265
- !reference [.test-pipeline-job, rules]
@@ -273,6 +273,25 @@ SPM Build (Swift 5.10):
273273
- make spm-build-macos
274274
- make spm-build-watchos
275275

276+
SPM Build (Swift 6.0):
277+
stage: smoke-test
278+
rules:
279+
- !reference [.test-pipeline-job, rules]
280+
- !reference [.release-pipeline-job, rules]
281+
tags:
282+
- macos:sonoma
283+
- specific:true
284+
variables:
285+
XCODE: "16.2.0"
286+
script:
287+
- ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --visionOS --watchOS
288+
- make clean repo-setup ENV=ci
289+
- make spm-build-ios
290+
- make spm-build-tvos
291+
- make spm-build-visionos
292+
- make spm-build-macos
293+
- make spm-build-watchos
294+
276295
SPI Docs Build:
277296
stage: lint
278297
rules:
@@ -361,8 +380,13 @@ Dogfood (Datadog app):
361380

362381
Build Artifacts:
363382
stage: release-build
364-
rules:
383+
tags:
384+
- macos:sonoma
385+
- specific:true
386+
rules:
365387
- !reference [.release-pipeline-job, rules]
388+
variables:
389+
XCODE: "16.2.0"
366390
id_tokens:
367391
<<: *dd-octo-sts-id-token
368392
artifacts:
@@ -372,7 +396,7 @@ Build Artifacts:
372396
before_script:
373397
- *export_MAKE_release_params
374398
script:
375-
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --ssh
399+
- ./tools/runner-setup.sh --xcode "$XCODE" --ssh
376400
- make env-check
377401
- make clean
378402
- make release-build release-validate

DatadogCore/Sources/Core/Context/NetworkConnectionInfoPublisher.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extension NetworkConnectionInfo {
6767
}(),
6868
linkQuality: {
6969
#if compiler(>=6.2)
70-
guard #available(iOS 26.0, tvOS 26.0, macOS 26.0, watchOS 26.0, *) else {
70+
guard #available(iOS 26.0, tvOS 26.0, macOS 26.0, watchOS 26.0, visionOS 26.0, *) else {
7171
return nil
7272
}
7373
return NetworkConnectionInfo.LinkQuality(path.linkQuality)

DatadogSessionReplay/SRSnapshotTests/SRFixtures/Sources/SRFixtures/Resources/Storyboards/Basic.storyboard

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_12" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -18,7 +18,7 @@
1818
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
1919
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2020
<subviews>
21-
<view tag="1" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZQ5-JB-MdC">
21+
<view clipsSubviews="YES" tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZQ5-JB-MdC">
2222
<rect key="frame" x="70.666666666666686" y="306" width="252" height="240"/>
2323
<subviews>
2424
<view tag="2" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aTj-Ne-iid">
@@ -100,7 +100,7 @@
100100
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
101101
<subviews>
102102
<stackView opaque="NO" tag="1" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="5e8-XJ-d05">
103-
<rect key="frame" x="20" y="79" width="353" height="686"/>
103+
<rect key="frame" x="20" y="138" width="353" height="686"/>
104104
<subviews>
105105
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Labels" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nE2-nF-tR0">
106106
<rect key="frame" x="0.0" y="0.0" width="353" height="36"/>
@@ -140,7 +140,7 @@
140140
<nil key="highlightedColor"/>
141141
</label>
142142
<textView clipsSubviews="YES" multipleTouchEnabled="YES" tag="3" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="43n-fB-GL1">
143-
<rect key="frame" x="0.0" y="375.66666666666669" width="353" height="128"/>
143+
<rect key="frame" x="0.0" y="375.66666666666663" width="353" height="128"/>
144144
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
145145
<constraints>
146146
<constraint firstAttribute="height" constant="128" id="Xep-n3-nDX"/>
@@ -196,37 +196,37 @@
196196
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
197197
<subviews>
198198
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="iVG-Wr-n4i">
199-
<rect key="frame" x="16" y="91" width="361" height="695"/>
199+
<rect key="frame" x="16" y="150" width="361" height="602"/>
200200
<subviews>
201201
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N2G-GR-2mn" userLabel="Safari">
202202
<rect key="frame" x="0.0" y="0.0" width="361" height="80"/>
203203
<constraints>
204204
<constraint firstAttribute="height" constant="80" id="v8r-0G-VN9"/>
205205
</constraints>
206206
<state key="normal" title="Button"/>
207-
<buttonConfiguration key="configuration" style="filled" title="Safari"/>
207+
<buttonConfiguration key="configuration" style="filled" title="Safari" cornerStyle="fixed"/>
208208
<connections>
209209
<action selector="showSafari" destination="tgf-1d-byI" eventType="touchUpInside" id="UGe-Sp-RdZ"/>
210210
</connections>
211211
</button>
212212
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7A9-o6-cEd" userLabel="Alert">
213-
<rect key="frame" x="0.0" y="307.66666666666669" width="361" height="80"/>
213+
<rect key="frame" x="0.0" y="261" width="361" height="80"/>
214214
<constraints>
215215
<constraint firstAttribute="height" constant="80" id="aey-gy-RuP"/>
216216
</constraints>
217217
<state key="normal" title="Button"/>
218-
<buttonConfiguration key="configuration" style="filled" title="Alert"/>
218+
<buttonConfiguration key="configuration" style="filled" title="Alert" cornerStyle="fixed"/>
219219
<connections>
220220
<action selector="showAlert" destination="tgf-1d-byI" eventType="touchUpInside" id="jG8-je-eTP"/>
221221
</connections>
222222
</button>
223223
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="soI-GK-CIw" userLabel="Activity">
224-
<rect key="frame" x="0.0" y="615" width="361" height="80"/>
224+
<rect key="frame" x="0.0" y="522" width="361" height="80"/>
225225
<constraints>
226226
<constraint firstAttribute="height" constant="80" id="UL9-Vy-iVS"/>
227227
</constraints>
228228
<state key="normal" title="Button"/>
229-
<buttonConfiguration key="configuration" style="filled" title="Activity"/>
229+
<buttonConfiguration key="configuration" style="filled" title="Activity" cornerStyle="fixed"/>
230230
<connections>
231231
<action selector="showActivity" destination="tgf-1d-byI" eventType="touchUpInside" id="QzX-DF-T3R"/>
232232
</connections>
@@ -243,6 +243,11 @@
243243
<constraint firstItem="iVG-Wr-n4i" firstAttribute="leading" secondItem="ut1-S9-9ez" secondAttribute="leading" constant="16" id="sj8-hO-VQC"/>
244244
</constraints>
245245
</view>
246+
<connections>
247+
<outletCollection property="buttons" destination="N2G-GR-2mn" collectionClass="NSMutableArray" id="gC6-u6-jsx"/>
248+
<outletCollection property="buttons" destination="7A9-o6-cEd" collectionClass="NSMutableArray" id="XfV-MT-OvO"/>
249+
<outletCollection property="buttons" destination="soI-GK-CIw" collectionClass="NSMutableArray" id="mJ4-JR-e03"/>
250+
</connections>
246251
</viewController>
247252
<placeholder placeholderIdentifier="IBFirstResponder" id="geZ-kh-a5V" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
248253
</objects>

0 commit comments

Comments
 (0)