Skip to content

Commit e3020c3

Browse files
authored
Remove code that supports < Swift 6.0 (#8348)
`swift-build` is a dependency of swift-package-manager that requires >= Swift 6.0 to build. SPM also requires swift-testing for tests, which requires >= Swift 6.0. Clean up legacy code that skipped tests on 5.10 and below, as well as conditional compilation directives on imports.
1 parent f7c3efc commit e3020c3

31 files changed

+0
-205
lines changed

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ final class BasicTests: XCTestCase {
1919

2020
func testExamplePackageDealer() throws {
2121
try XCTSkipIf(isSelfHosted, "These packages don't use the latest runtime library, which doesn't work with self-hosted builds.")
22-
try skipUnlessAtLeastSwift6()
2322

2423
try withTemporaryDirectory { tempDir in
2524
let packagePath = tempDir.appending(component: "dealer")
@@ -94,8 +93,6 @@ final class BasicTests: XCTestCase {
9493
}
9594

9695
func testSwiftPackageInitExec() throws {
97-
try skipUnlessAtLeastSwift6()
98-
9996
try withTemporaryDirectory { tempDir in
10097
// Create a new package with an executable target.
10198
let packagePath = tempDir.appending(component: "Project")
@@ -121,8 +118,6 @@ final class BasicTests: XCTestCase {
121118
}
122119

123120
func testSwiftPackageInitExecTests() throws {
124-
try skipUnlessAtLeastSwift6()
125-
126121
try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
127122

128123
try withTemporaryDirectory { tempDir in
@@ -146,8 +141,6 @@ final class BasicTests: XCTestCase {
146141
}
147142

148143
func testSwiftPackageInitLib() throws {
149-
try skipUnlessAtLeastSwift6()
150-
151144
try withTemporaryDirectory { tempDir in
152145
// Create a new package with an executable target.
153146
let packagePath = tempDir.appending(component: "Project")
@@ -166,8 +159,6 @@ final class BasicTests: XCTestCase {
166159
}
167160

168161
func testSwiftPackageLibsTests() throws {
169-
try skipUnlessAtLeastSwift6()
170-
171162
try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
172163

173164
try withTemporaryDirectory { tempDir in
@@ -226,8 +217,6 @@ final class BasicTests: XCTestCase {
226217
}
227218

228219
func testSwiftRun() throws {
229-
try skipUnlessAtLeastSwift6()
230-
231220
try withTemporaryDirectory { tempDir in
232221
let packagePath = tempDir.appending(component: "secho")
233222
try localFileSystem.createDirectory(packagePath)
@@ -255,8 +244,6 @@ final class BasicTests: XCTestCase {
255244
}
256245

257246
func testSwiftTest() throws {
258-
try skipUnlessAtLeastSwift6()
259-
260247
try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
261248

262249
try withTemporaryDirectory { tempDir in
@@ -378,9 +365,3 @@ private extension Character {
378365
}
379366
}
380367
}
381-
382-
private func skipUnlessAtLeastSwift6() throws {
383-
#if compiler(<6.0)
384-
try XCTSkipIf(true, "Skipping because test requires at least Swift 6.0")
385-
#endif
386-
}

Sources/Basics/OSSignpost.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#if canImport(os)
14-
#if compiler(>=6.0)
1514
import os
16-
#else
17-
@preconcurrency import os
18-
#endif
1915

2016
extension os.OSLog {
2117
@usableFromInline

Sources/Build/LLBuildCommands.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,6 @@ final class TestEntryPointCommand: CustomLLBuildCommand, TestBuildCommand {
240240
if buildParameters.triple.isLinux() {
241241
// FIXME: work around crash on Amazon Linux 2 when main function is async (rdar://128303921)
242242
needsAsyncMainWorkaround = true
243-
} else if buildParameters.triple.isDarwin() {
244-
#if compiler(<5.10)
245-
// FIXME: work around duplicate async_Main symbols (SEE https://github.com/swiftlang/swift/pull/69113)
246-
needsAsyncMainWorkaround = true
247-
#endif
248243
}
249244

250245
stream.send(

Sources/Commands/PackageCommands/Init.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,4 @@ extension SwiftPackageCommand {
8585
}
8686
}
8787

88-
#if compiler(<6.0)
89-
extension InitPackage.PackageType: ExpressibleByArgument {}
90-
#else
9188
extension InitPackage.PackageType: @retroactive ExpressibleByArgument {}
92-
#endif

Sources/Commands/Utilities/APIDigester.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,4 @@ extension SerializedDiagnostics.SourceLocation {
331331
}
332332
}
333333

334-
#if compiler(<6.0)
335-
extension SerializedDiagnostics.SourceLocation: DiagnosticLocation {}
336-
#else
337334
extension SerializedDiagnostics.SourceLocation: @retroactive DiagnosticLocation {}
338-
#endif

Sources/CoreCommands/Options.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -780,16 +780,6 @@ extension URL {
780780
}
781781
}
782782

783-
#if compiler(<6.0)
784-
extension BuildConfiguration: ExpressibleByArgument, CaseIterable {}
785-
extension AbsolutePath: ExpressibleByArgument {}
786-
extension WorkspaceConfiguration.CheckingMode: ExpressibleByArgument {}
787-
extension Sanitizer: ExpressibleByArgument {}
788-
extension BuildSystemProvider.Kind: ExpressibleByArgument, CaseIterable {}
789-
extension Version: ExpressibleByArgument {}
790-
extension PackageIdentity: ExpressibleByArgument {}
791-
extension URL: ExpressibleByArgument {}
792-
#else
793783
extension BuildConfiguration: @retroactive ExpressibleByArgument, CaseIterable {}
794784
extension AbsolutePath: @retroactive ExpressibleByArgument {}
795785
extension WorkspaceConfiguration.CheckingMode: @retroactive ExpressibleByArgument {}
@@ -798,4 +788,3 @@ extension BuildSystemProvider.Kind: @retroactive ExpressibleByArgument, CaseIter
798788
extension Version: @retroactive ExpressibleByArgument {}
799789
extension PackageIdentity: @retroactive ExpressibleByArgument {}
800790
extension URL: @retroactive ExpressibleByArgument {}
801-
#endif

Sources/PackageRegistryCommand/PackageRegistryCommand+Publish.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,7 @@ extension SignatureFormat {
247247
}
248248
}
249249

250-
#if compiler(<6.0)
251-
extension SignatureFormat: ExpressibleByArgument {}
252-
#else
253250
extension SignatureFormat: @retroactive ExpressibleByArgument {}
254-
#endif
255251

256252
enum MetadataLocation {
257253
case sourceTree(AbsolutePath)

Sources/Workspace/Diagnostics.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,4 @@ extension FileSystemError {
255255
}
256256
}
257257

258-
#if compiler(<6.0)
259-
extension FileSystemError: CustomStringConvertible {}
260-
#else
261258
extension FileSystemError: @retroactive CustomStringConvertible {}
262-
#endif

Sources/Workspace/Workspace.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,11 +1519,7 @@ private func warnToStderr(_ message: String) {
15191519
}
15201520

15211521
// used for manifest validation
1522-
#if compiler(<6.0)
1523-
extension RepositoryManager: ManifestSourceControlValidator {}
1524-
#else
15251522
extension RepositoryManager: @retroactive ManifestSourceControlValidator {}
1526-
#endif
15271523

15281524
extension ContainerUpdateStrategy {
15291525
var repositoryUpdateStrategy: RepositoryUpdateStrategy {

Sources/_InternalTestSupport/XCTSkipHelpers.swift

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)