Skip to content

Commit d2e2d97

Browse files
committed
Drop support for Xcode 15
1 parent 501c1c7 commit d2e2d97

32 files changed

+51
-1800
lines changed

.github/workflows/build-pr.yml

Lines changed: 40 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,6 @@ jobs:
2727
- run: brew install swiftlint
2828
- run: sh build.sh verify-swiftlint
2929

30-
osx-15_3:
31-
runs-on: macos-14
32-
name: Test osx on Xcode 15.3
33-
env:
34-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
35-
steps:
36-
- uses: actions/checkout@v4
37-
- run: sh -x build.sh ci-pr osx
38-
39-
osx-15_4:
40-
runs-on: macos-14
41-
name: Test osx on Xcode 15.4
42-
env:
43-
DEVELOPER_DIR: '/Applications/Xcode_15.4.app/Contents/Developer'
44-
steps:
45-
- uses: actions/checkout@v4
46-
- run: sh -x build.sh ci-pr osx
47-
48-
osx-16_2:
49-
runs-on: macos-15
50-
name: Test osx on Xcode 16.2
51-
env:
52-
DEVELOPER_DIR: '/Applications/Xcode_16.2.app/Contents/Developer'
53-
steps:
54-
- uses: actions/checkout@v4
55-
- run: sh -x build.sh ci-pr osx
56-
5730
osx-16_3:
5831
runs-on: macos-15
5932
name: Test osx on Xcode 16.3
@@ -90,11 +63,11 @@ jobs:
9063
- uses: actions/checkout@v4
9164
- run: sh -x build.sh ci-pr osx-encryption
9265

93-
swiftpm-15_3:
94-
runs-on: macos-14
95-
name: Test swiftpm on Xcode 15.3
66+
swiftpm-16_3:
67+
runs-on: macos-15
68+
name: Test swiftpm on Xcode 16.3
9669
env:
97-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
70+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
9871
steps:
9972
- uses: actions/checkout@v4
10073
- run: sh -x build.sh ci-pr swiftpm
@@ -108,33 +81,6 @@ jobs:
10881
- uses: actions/checkout@v4
10982
- run: sh -x build.sh ci-pr swiftpm
11083

111-
swiftpm-debug-15_3:
112-
runs-on: macos-14
113-
name: Test swiftpm-debug on Xcode 15.3
114-
env:
115-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
116-
steps:
117-
- uses: actions/checkout@v4
118-
- run: sh -x build.sh ci-pr swiftpm-debug
119-
120-
swiftpm-debug-15_4:
121-
runs-on: macos-14
122-
name: Test swiftpm-debug on Xcode 15.4
123-
env:
124-
DEVELOPER_DIR: '/Applications/Xcode_15.4.app/Contents/Developer'
125-
steps:
126-
- uses: actions/checkout@v4
127-
- run: sh -x build.sh ci-pr swiftpm-debug
128-
129-
swiftpm-debug-16_2:
130-
runs-on: macos-15
131-
name: Test swiftpm-debug on Xcode 16.2
132-
env:
133-
DEVELOPER_DIR: '/Applications/Xcode_16.2.app/Contents/Developer'
134-
steps:
135-
- uses: actions/checkout@v4
136-
- run: sh -x build.sh ci-pr swiftpm-debug
137-
13884
swiftpm-debug-16_3:
13985
runs-on: macos-15
14086
name: Test swiftpm-debug on Xcode 16.3
@@ -180,11 +126,11 @@ jobs:
180126
- uses: actions/checkout@v4
181127
- run: sh -x build.sh ci-pr swiftpm-thread
182128

183-
ios-static-15_3:
184-
runs-on: macos-14
185-
name: Test ios-static on Xcode 15.3
129+
ios-static-16_3:
130+
runs-on: macos-15
131+
name: Test ios-static on Xcode 16.3
186132
env:
187-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
133+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
188134
steps:
189135
- uses: actions/checkout@v4
190136
- run: sh -x build.sh ci-pr ios-static
@@ -198,11 +144,11 @@ jobs:
198144
- uses: actions/checkout@v4
199145
- run: sh -x build.sh ci-pr ios-static
200146

201-
ios-15_3:
202-
runs-on: macos-14
203-
name: Test ios on Xcode 15.3
147+
ios-16_3:
148+
runs-on: macos-15
149+
name: Test ios on Xcode 16.3
204150
env:
205-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
151+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
206152
steps:
207153
- uses: actions/checkout@v4
208154
- run: sh -x build.sh ci-pr ios
@@ -216,11 +162,11 @@ jobs:
216162
- uses: actions/checkout@v4
217163
- run: sh -x build.sh ci-pr ios
218164

219-
watchos-15_3:
220-
runs-on: macos-14
221-
name: Test watchos on Xcode 15.3
165+
watchos-16_3:
166+
runs-on: macos-15
167+
name: Test watchos on Xcode 16.3
222168
env:
223-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
169+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
224170
steps:
225171
- uses: actions/checkout@v4
226172
- run: sh -x build.sh ci-pr watchos
@@ -234,11 +180,11 @@ jobs:
234180
- uses: actions/checkout@v4
235181
- run: sh -x build.sh ci-pr watchos
236182

237-
tvos-15_3:
238-
runs-on: macos-14
239-
name: Test tvos on Xcode 15.3
183+
tvos-16_3:
184+
runs-on: macos-15
185+
name: Test tvos on Xcode 16.3
240186
env:
241-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
187+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
242188
steps:
243189
- uses: actions/checkout@v4
244190
- run: sh -x build.sh ci-pr tvos
@@ -252,11 +198,11 @@ jobs:
252198
- uses: actions/checkout@v4
253199
- run: sh -x build.sh ci-pr tvos
254200

255-
visionos-15_3:
256-
runs-on: macos-14
257-
name: Test visionos on Xcode 15.3
201+
visionos-16_3:
202+
runs-on: macos-15
203+
name: Test visionos on Xcode 16.3
258204
env:
259-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
205+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
260206
steps:
261207
- uses: actions/checkout@v4
262208
- run: sh -x build.sh ci-pr visionos
@@ -270,33 +216,6 @@ jobs:
270216
- uses: actions/checkout@v4
271217
- run: sh -x build.sh ci-pr visionos
272218

273-
osx-swift-15_3:
274-
runs-on: macos-14
275-
name: Test osx-swift on Xcode 15.3
276-
env:
277-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
278-
steps:
279-
- uses: actions/checkout@v4
280-
- run: sh -x build.sh ci-pr osx-swift
281-
282-
osx-swift-15_4:
283-
runs-on: macos-14
284-
name: Test osx-swift on Xcode 15.4
285-
env:
286-
DEVELOPER_DIR: '/Applications/Xcode_15.4.app/Contents/Developer'
287-
steps:
288-
- uses: actions/checkout@v4
289-
- run: sh -x build.sh ci-pr osx-swift
290-
291-
osx-swift-16_2:
292-
runs-on: macos-15
293-
name: Test osx-swift on Xcode 16.2
294-
env:
295-
DEVELOPER_DIR: '/Applications/Xcode_16.2.app/Contents/Developer'
296-
steps:
297-
- uses: actions/checkout@v4
298-
- run: sh -x build.sh ci-pr osx-swift
299-
300219
osx-swift-16_3:
301220
runs-on: macos-15
302221
name: Test osx-swift on Xcode 16.3
@@ -324,11 +243,11 @@ jobs:
324243
- uses: actions/checkout@v4
325244
- run: sh -x build.sh ci-pr osx-swift
326245

327-
ios-swift-15_3:
328-
runs-on: macos-14
329-
name: Test ios-swift on Xcode 15.3
246+
ios-swift-16_3:
247+
runs-on: macos-15
248+
name: Test ios-swift on Xcode 16.3
330249
env:
331-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
250+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
332251
steps:
333252
- uses: actions/checkout@v4
334253
- run: sh -x build.sh ci-pr ios-swift
@@ -342,11 +261,11 @@ jobs:
342261
- uses: actions/checkout@v4
343262
- run: sh -x build.sh ci-pr ios-swift
344263

345-
tvos-swift-15_3:
346-
runs-on: macos-14
347-
name: Test tvos-swift on Xcode 15.3
264+
tvos-swift-16_3:
265+
runs-on: macos-15
266+
name: Test tvos-swift on Xcode 16.3
348267
env:
349-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
268+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
350269
steps:
351270
- uses: actions/checkout@v4
352271
- run: sh -x build.sh ci-pr tvos-swift
@@ -387,11 +306,11 @@ jobs:
387306
- uses: actions/checkout@v4
388307
- run: sh -x build.sh ci-pr tvos-swift-evolution
389308

390-
catalyst-15_3:
391-
runs-on: macos-14
392-
name: Test catalyst on Xcode 15.3
309+
catalyst-16_3:
310+
runs-on: macos-15
311+
name: Test catalyst on Xcode 16.3
393312
env:
394-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
313+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
395314
steps:
396315
- uses: actions/checkout@v4
397316
- run: sh -x build.sh ci-pr catalyst
@@ -405,11 +324,11 @@ jobs:
405324
- uses: actions/checkout@v4
406325
- run: sh -x build.sh ci-pr catalyst
407326

408-
catalyst-swift-15_3:
409-
runs-on: macos-14
410-
name: Test catalyst-swift on Xcode 15.3
327+
catalyst-swift-16_3:
328+
runs-on: macos-15
329+
name: Test catalyst-swift on Xcode 16.3
411330
env:
412-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
331+
DEVELOPER_DIR: '/Applications/Xcode_16.3.app/Contents/Developer'
413332
steps:
414333
- uses: actions/checkout@v4
415334
- run: sh -x build.sh ci-pr catalyst-swift
@@ -432,33 +351,6 @@ jobs:
432351
- uses: actions/checkout@v4
433352
- run: sh -x build.sh ci-pr xcframework
434353

435-
cocoapods-osx-15_3:
436-
runs-on: macos-14
437-
name: Test cocoapods-osx on Xcode 15.3
438-
env:
439-
DEVELOPER_DIR: '/Applications/Xcode_15.3.app/Contents/Developer'
440-
steps:
441-
- uses: actions/checkout@v4
442-
- run: sh -x build.sh ci-pr cocoapods-osx
443-
444-
cocoapods-osx-15_4:
445-
runs-on: macos-14
446-
name: Test cocoapods-osx on Xcode 15.4
447-
env:
448-
DEVELOPER_DIR: '/Applications/Xcode_15.4.app/Contents/Developer'
449-
steps:
450-
- uses: actions/checkout@v4
451-
- run: sh -x build.sh ci-pr cocoapods-osx
452-
453-
cocoapods-osx-16_2:
454-
runs-on: macos-15
455-
name: Test cocoapods-osx on Xcode 16.2
456-
env:
457-
DEVELOPER_DIR: '/Applications/Xcode_16.2.app/Contents/Developer'
458-
steps:
459-
- uses: actions/checkout@v4
460-
- run: sh -x build.sh ci-pr cocoapods-osx
461-
462354
cocoapods-osx-16_3:
463355
runs-on: macos-15
464356
name: Test cocoapods-osx on Xcode 16.3

.github/workflows/master-push.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "master"
77
- "release/**"
88
env:
9-
XCODE_VERSION: "['15.3', '15.4', '16.2', '16.3', '16.4', '26']"
9+
XCODE_VERSION: "['16.3', '16.4', '26.0.1']"
1010
PLATFORM: "['ios', 'osx', 'watchos', 'tvos', 'catalyst', 'visionos']"
1111
RELEASE_VERSION: '16.4'
1212
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
@@ -68,23 +68,14 @@ jobs:
6868
xcode-version: ${{ fromJSON(needs.prepare.outputs.XCODE_VERSIONS_MATRIX) }}
6969
configuration: [swift, static]
7070
include:
71-
- xcode-version: 15.3
72-
xcode-version-tag: 15.3
73-
os: macos-14
74-
- xcode-version: 15.4
75-
xcode-version-tag: 15.4
76-
os: macos-14
77-
- xcode-version: 16.2
78-
xcode-version-tag: 16.2
79-
os: macos-15
8071
- xcode-version: 16.3
8172
xcode-version-tag: 16.3
8273
os: macos-15
8374
- xcode-version: 16.4
8475
xcode-version-tag: 16.4
8576
os: macos-15
86-
- xcode-version: 26.0
87-
xcode-version-tag: 26
77+
- xcode-version: 26.0.1
78+
xcode-version-tag: 26.0.1
8879
os: macos-15
8980
exclude:
9081
- platform: osx
@@ -213,17 +204,11 @@ jobs:
213204
matrix:
214205
xcode-version: ${{ fromJSON(needs.prepare.outputs.XCODE_VERSIONS_MATRIX) }}
215206
include:
216-
- xcode-version: 15.3
217-
os: macos-14
218-
- xcode-version: 15.4
219-
os: macos-14
220-
- xcode-version: 16.2
221-
os: macos-15
222207
- xcode-version: 16.3
223208
os: macos-15
224209
- xcode-version: 16.4
225210
os: macos-15
226-
- xcode-version: 26.0
211+
- xcode-version: 26.0.1
227212
os: macos-15
228213
env:
229214
PLATFORM: 'osx'

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Publish release
22
on: workflow_dispatch
33
env:
4-
XCODE_VERSION: "['15.3', '15.4', '16', '16.1', '16.2', '16.3']"
5-
TEST_XCODE_VERSION: '16.3'
4+
XCODE_VERSION: "['16.3', '16.4', '26']"
5+
TEST_XCODE_VERSION: '16.4'
66
jobs:
77
prepare:
88
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ x.y.z Release notes (yyyy-MM-dd)
1414
* APIs are backwards compatible with all previous releases in the 10.x.y series.
1515
* Carthage release for Swift is built with Xcode 16.4.0.
1616
* CocoaPods: 1.10 or later.
17-
* Xcode: 15.3.0-26 beta 1.
17+
* Xcode: 16.2.0-26.0.1.
1818

1919
### Internal
2020
* Upgraded realm-core from ? to ?

Realm/ObjectServerTests/AsyncSyncTests.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,7 @@ class AsyncAwaitSyncTests: SwiftSyncTestCase {
279279

280280
let configuration = try configuration()
281281
func isolatedOpen(_ actor: isolated CustomExecutorActor) async throws {
282-
#if compiler(<6)
283-
_ = try await Realm(configuration: configuration, actor: actor, downloadBeforeOpen: .always)
284-
#else
285282
_ = try await Realm.open(configuration: configuration, downloadBeforeOpen: .always)
286-
#endif
287283
}
288284

289285

@@ -905,11 +901,7 @@ class AsyncFlexibleSyncTests: SwiftSyncTestCase {
905901
let user = try await createUser()
906902
var config = user.flexibleSyncConfiguration()
907903
config.objectTypes = [SwiftPerson.self]
908-
#if compiler(<6)
909-
let realm = try await Realm(configuration: config, actor: CustomGlobalActor.shared)
910-
#else
911904
let realm = try await Realm.open(configuration: config)
912-
#endif
913905
let name = self.name
914906
let results1 = try await realm.objects(SwiftPerson.self)
915907
.where { $0.firstName == name && $0.age > 8 }.subscribe(waitForSync: .onCreation)

0 commit comments

Comments
 (0)