Skip to content

Commit 99ed4b3

Browse files
authored
Remove references to Xcode 16 Beta 1 (just Xcode 16, please.) (#966)
This PR replaces references to Xcode 16 Beta 1, which are generally centred around our JSON ABI, with references to Xcode 16. All versions of Xcode 16 use a legacy JSON schema, not just Beta 1. ### Checklist: - [x] Code and documentation should follow the style of the [Style Guide](https://github.com/apple/swift-testing/blob/main/Documentation/StyleGuide.md). - [x] If public symbols are renamed or modified, DocC references should be updated.
1 parent 7efce39 commit 99ed4b3

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

Sources/Testing/ABI/ABI.Record+Streaming.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ extension ABI.Version {
7070
}
7171

7272
#if !SWT_NO_SNAPSHOT_TYPES
73-
// MARK: - Xcode 16 Beta 1 compatibility
73+
// MARK: - Xcode 16 compatibility
7474

75-
extension ABI.Xcode16Beta1 {
75+
extension ABI.Xcode16 {
7676
static func eventHandler(
7777
encodeAsJSONLines: Bool,
7878
forwardingTo eventHandler: @escaping @Sendable (_ recordJSON: UnsafeRawBufferPointer) -> Void
7979
) -> Event.Handler {
8080
return { event, context in
8181
if case .testDiscovered = event.kind {
8282
// Discard events of this kind rather than forwarding them to avoid a
83-
// crash in Xcode 16 Beta 1 (which does not expect any events to occur
84-
// before .runStarted.)
83+
// crash in Xcode 16 (which does not expect any events to occur before
84+
// .runStarted.)
8585
return
8686
}
8787

Sources/Testing/ABI/ABI.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ extension ABI {
4848

4949
extension ABI {
5050
#if !SWT_NO_SNAPSHOT_TYPES
51-
/// A namespace and version type for Xcode 16 Beta 1 compatibility.
51+
/// A namespace and version type for Xcode 16 compatibility.
5252
///
5353
/// - Warning: This type will be removed in a future update.
54-
enum Xcode16Beta1: Sendable, Version {
54+
enum Xcode16: Sendable, Version {
5555
static var versionNumber: Int {
5656
-1
5757
}

Sources/Testing/ABI/EntryPoints/ABIEntryPoint.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ extension ABI.v0 {
6666
}
6767

6868
#if !SWT_NO_SNAPSHOT_TYPES
69-
// MARK: - Xcode 16 Beta 1 compatibility
69+
// MARK: - Xcode 16 compatibility
7070

71-
extension ABI.Xcode16Beta1 {
72-
/// An older signature for ``ABI/v0/EntryPoint-swift.typealias`` used by Xcode
73-
/// 16 Beta 1.
71+
extension ABI.Xcode16 {
72+
/// An older signature for ``ABI/v0/EntryPoint-swift.typealias`` used by
73+
/// Xcode 16.
7474
///
7575
/// - Warning: This type will be removed in a future update.
7676
@available(*, deprecated, message: "Use ABI.v0.EntryPoint instead.")
@@ -81,13 +81,13 @@ extension ABI.Xcode16Beta1 {
8181
}
8282

8383
/// An older signature for ``ABI/v0/entryPoint-swift.type.property`` used by
84-
/// Xcode 16 Beta 1.
84+
/// Xcode 16.
8585
///
8686
/// - Warning: This function will be removed in a future update.
8787
@available(*, deprecated, message: "Use ABI.v0.entryPoint (swt_abiv0_getEntryPoint()) instead.")
8888
@_cdecl("swt_copyABIEntryPoint_v0")
8989
@usableFromInline func copyABIEntryPoint_v0() -> UnsafeMutableRawPointer {
90-
let result = UnsafeMutablePointer<ABI.Xcode16Beta1.EntryPoint>.allocate(capacity: 1)
90+
let result = UnsafeMutablePointer<ABI.Xcode16.EntryPoint>.allocate(capacity: 1)
9191
result.initialize { configurationJSON, recordHandler in
9292
try await _entryPoint(
9393
configurationJSON: configurationJSON,
@@ -102,7 +102,7 @@ extension ABI.Xcode16Beta1 {
102102
// MARK: -
103103

104104
/// A common implementation for ``ABI/v0/entryPoint-swift.type.property`` and
105-
/// ``copyABIEntryPoint_v0()`` that provides Xcode 16 Beta 1 compatibility.
105+
/// ``copyABIEntryPoint_v0()`` that provides Xcode&nbsp;16 compatibility.
106106
///
107107
/// This function will be removed (with its logic incorporated into
108108
/// ``ABI/v0/entryPoint-swift.type.property``) in a future update.
@@ -125,9 +125,9 @@ private func _entryPoint(
125125
let eventHandler = try eventHandlerForStreamingEvents(version: args?.eventStreamVersion, encodeAsJSONLines: false, forwardingTo: recordHandler)
126126
let exitCode = await entryPoint(passing: args, eventHandler: eventHandler)
127127

128-
// To maintain compatibility with Xcode 16 Beta 1, suppress custom exit codes.
129-
// (This is also needed by ABI.v0.entryPoint to correctly treat the no-tests
130-
// as a successful run.)
128+
// To maintain compatibility with Xcode 16, suppress custom exit codes. (This
129+
// is also needed by ABI.v0.entryPoint to correctly treat the no-tests as a
130+
// successful run.)
131131
if exitCode == EXIT_NO_TESTS_FOUND {
132132
return EXIT_SUCCESS
133133
}

Sources/Testing/ABI/EntryPoints/EntryPoint.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,9 +633,9 @@ func eventHandlerForStreamingEvents(
633633
eventHandler(for: ABI.CurrentVersion.self)
634634
#if !SWT_NO_SNAPSHOT_TYPES
635635
case -1:
636-
// Legacy support for Xcode 16 betas. Support for this undocumented version
637-
// will be removed in a future update. Do not use it.
638-
eventHandler(for: ABI.Xcode16Beta1.self)
636+
// Legacy support for Xcode 16. Support for this undocumented version will
637+
// be removed in a future update. Do not use it.
638+
eventHandler(for: ABI.Xcode16.self)
639639
#endif
640640
case 0:
641641
eventHandler(for: ABI.v0.self)

Tests/TestingTests/ABIEntryPointTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct ABIEntryPointTests {
6262
)
6363
}
6464
#endif
65-
let abiEntryPoint = copyABIEntryPoint_v0().assumingMemoryBound(to: ABI.Xcode16Beta1.EntryPoint.self)
65+
let abiEntryPoint = copyABIEntryPoint_v0().assumingMemoryBound(to: ABI.Xcode16.EntryPoint.self)
6666
defer {
6767
abiEntryPoint.deinitialize(count: 1)
6868
abiEntryPoint.deallocate()

0 commit comments

Comments
 (0)