Remove remaining Swift 5.10 support.

.spi.yml

@@ -3,8 +3,6 @@ metadata:
   authors: Apple Inc.
 builder:
   configs:
-    - swift_version: 5.10
-      scheme: Testing
     - swift_version: 6.0
       documentation_targets: [Testing]
       scheme: Testing

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 
 //
 // This source file is part of the Swift.org open source project
@@ -33,7 +33,7 @@ let package = Package(
   ],
 
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", from: Version(stringLiteral: Context.environment["SWT_SWIFT_SYNTAX_VERSION"] ?? "600.0.0-latest")),
+    .package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.0-latest"),
   ],
 
   targets: [
@@ -121,7 +121,6 @@ extension Array where Element == PackageDescription.SwiftSetting {
       .unsafeFlags(["-require-explicit-sendable"]),
       .enableExperimentalFeature("StrictConcurrency"),
       .enableUpcomingFeature("ExistentialAny"),
-      .enableUpcomingFeature("InferSendableFromCaptures"),
 
       .enableExperimentalFeature("AccessLevelOnImport"),
       .enableUpcomingFeature("InternalImportsByDefault"),
@@ -155,8 +154,20 @@ extension Array where Element == PackageDescription.CXXSetting {
   /// Settings intended to be applied to every C++ target in this package.
   /// Analogous to project-level build settings in an Xcode project.
   static var packageSettings: Self {
-    [
-      .define("_SWT_TESTING_LIBRARY_VERSION", to: #""unknown (Swift 5.10 toolchain)""#),
-    ]
+    var result = Self()
+
+    // Capture the testing library's version as a C++ string constant.
+    if let git = Context.gitInformation {
+      let testingLibraryVersion = if let tag = git.currentTag {
+        tag
+      } else if git.hasUncommittedChanges {
+        "\(git.currentCommit) (modified)"
+      } else {
+        git.currentCommit
+      }
+      result.append(.define("_SWT_TESTING_LIBRARY_VERSION", to: #""\#(testingLibraryVersion)""#))
+    }
+
+    return result
   }
 }

README.md

@@ -93,15 +93,15 @@ very best ideas, from anywhere, can help shape the future of testing in Swift.
 The table below describes the current level of support that Swift Testing has
 for various platforms:
 
-| **Platform** | **CI Status (5.10)** | **CI Status (6.0)** | **CI Status (main)** | **Support Status** |
-|---|:-:|:-:|:-:|---|
-| **macOS** | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-5.10-macos)](https://ci.swift.org/job/swift-testing-main-swift-5.10-macos/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-6.0-macos)](https://ci.swift.org/job/swift-testing-main-swift-6.0-macos/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-macos)](https://ci.swift.org/view/Swift%20Packages/job/swift-testing-main-swift-main-macos/) | Supported |
-| **iOS** | | | | Supported |
-| **watchOS** | | | | Supported |
-| **tvOS** | | | | Supported |
-| **visionOS** | | | | Supported |
-| **Ubuntu 22.04** | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-5.10-linux)](https://ci.swift.org/job/swift-testing-main-swift-5.10-linux/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-6.0-linux)](https://ci.swift.org/job/swift-testing-main-swift-6.0-linux/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-linux)](https://ci.swift.org/view/Swift%20Packages/job/swift-testing-main-swift-main-linux/) | Supported |
-| **Windows** | [![Build Status](https://ci-external.swift.org/buildStatus/icon?job=swift-testing-main-swift-5.10-windows)](https://ci-external.swift.org/job/swift-testing-main-swift-5.10-windows/) | | [![Build Status](https://ci-external.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-windows)](https://ci-external.swift.org/job/swift-testing-main-swift-main-windows/) | Supported |
+| **Platform** | **CI Status (6.0)** | **CI Status (main)** | **Support Status** |
+|---|:-:|:-:|---|
+| **macOS** | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-6.0-macos)](https://ci.swift.org/job/swift-testing-main-swift-6.0-macos/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-macos)](https://ci.swift.org/view/Swift%20Packages/job/swift-testing-main-swift-main-macos/) | Supported |
+| **iOS** | | | Supported |
+| **watchOS** | | | Supported |
+| **tvOS** | | | Supported |
+| **visionOS** | | | Supported |
+| **Ubuntu 22.04** | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-6.0-linux)](https://ci.swift.org/job/swift-testing-main-swift-6.0-linux/) | [![Build Status](https://ci.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-linux)](https://ci.swift.org/view/Swift%20Packages/job/swift-testing-main-swift-main-linux/) | Supported |
+| **Windows** | | [![Build Status](https://ci-external.swift.org/buildStatus/icon?job=swift-testing-main-swift-main-windows)](https://ci-external.swift.org/job/swift-testing-main-swift-main-windows/) | Supported |
 
 ### Works with XCTest
 

Sources/Testing/CMakeLists.txt

@@ -18,7 +18,6 @@ add_library(Testing
   EntryPoints/ABIv0/Encoded/ABIv0.EncodedTest.swift
   EntryPoints/EntryPoint.swift
   EntryPoints/SwiftPMEntryPoint.swift
-  EntryPoints/XCTestScaffold.swift
   Events/Clock.swift
   Events/Event.swift
   Events/Recorder/Event.ConsoleOutputRecorder.swift
@@ -61,7 +60,6 @@ add_library(Testing
   Support/Additions/CommandLineAdditions.swift
   Support/Additions/NumericAdditions.swift
   Support/Additions/ResultAdditions.swift
-  Support/Additions/StringAdditions.swift
   Support/CartesianProduct.swift
   Support/CError.swift
   Support/Environment.swift

Sources/Testing/EntryPoints/EntryPoint.swift

@@ -27,7 +27,7 @@ private import _TestingInternals
 /// External callers cannot call this function directly. The can use
 /// ``copyABIEntryPoint_v0()`` to get a reference to an ABI-stable version of
 /// this function.
-func entryPoint(passing args: consuming __CommandLineArguments_v0?, eventHandler: Event.Handler?) async -> CInt {
+func entryPoint(passing args: __CommandLineArguments_v0?, eventHandler: Event.Handler?) async -> CInt {
   let exitCode = Locked(rawValue: EXIT_SUCCESS)
 
   do {
@@ -239,12 +239,6 @@ public struct __CommandLineArguments_v0: Sendable {
 
   /// The value of the `--repeat-until` argument.
   public var repeatUntil: String?
-
-  /// The identifier of the `XCTestCase` instance hosting the testing library,
-  /// if ``XCTestScaffold`` is being used.
-  ///
-  /// This property is not ABI and will be removed with ``XCTestScaffold``.
-  var xcTestCaseHostIdentifier: String?
 }
 
 extension __CommandLineArguments_v0: Codable {
@@ -264,7 +258,6 @@ extension __CommandLineArguments_v0: Codable {
     case skip
     case repetitions
     case repeatUntil
-    case xcTestCaseHostIdentifier
   }
 }
 
@@ -471,7 +464,7 @@ public func configurationForEntryPoint(from args: __CommandLineArguments_v0) thr
 
 #if !SWT_NO_EXIT_TESTS
   // Enable exit test handling via __swiftPMEntryPoint().
-  configuration.exitTestHandler = ExitTest.handlerForEntryPoint(forXCTestCaseIdentifiedBy: args.xcTestCaseHostIdentifier)
+  configuration.exitTestHandler = ExitTest.handlerForEntryPoint()
 #endif
 
   return configuration