Skip to content

Commit 2fae93c

Browse files
authored
Set correct minimum OS targets for new packages using swift-testing (#7333)
1 parent cae580e commit 2fae93c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Sources/Workspace/InitPackage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ public final class InitPackage {
186186

187187
var platforms = options.platforms
188188

189-
// Macros require macOS 10.15, iOS 13, etc.
190-
if packageType == .macro {
189+
// Macros and swift-testing require macOS 10.15, iOS 13, etc.
190+
if packageType == .macro || options.supportedTestingLibraries.contains(.swiftTesting) {
191191
func addIfMissing(_ newPlatform: SupportedPlatform) {
192192
if platforms.contains(where: { platform in
193193
platform.platform == newPlatform.platform

Tests/WorkspaceTests/InitTests.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ class InitTests: XCTestCase {
170170
let manifest = path.appending("Package.swift")
171171
XCTAssertFileExists(manifest)
172172
let manifestContents: String = try localFileSystem.readFileContents(manifest)
173+
XCTAssertMatch(manifestContents, .contains(#".macOS(.v10_15)"#))
174+
XCTAssertMatch(manifestContents, .contains(#".iOS(.v13)"#))
175+
XCTAssertMatch(manifestContents, .contains(#".tvOS(.v13)"#))
176+
XCTAssertMatch(manifestContents, .contains(#".watchOS(.v6)"#))
177+
XCTAssertMatch(manifestContents, .contains(#".macCatalyst(.v13)"#))
173178
XCTAssertMatch(manifestContents, .contains(#"swift-testing.git", from: "0.2.0""#))
174179
XCTAssertMatch(manifestContents, .contains(#".product(name: "Testing", package: "swift-testing")"#))
175180

@@ -208,6 +213,11 @@ class InitTests: XCTestCase {
208213
let manifest = path.appending("Package.swift")
209214
XCTAssertFileExists(manifest)
210215
let manifestContents: String = try localFileSystem.readFileContents(manifest)
216+
XCTAssertMatch(manifestContents, .contains(#".macOS(.v10_15)"#))
217+
XCTAssertMatch(manifestContents, .contains(#".iOS(.v13)"#))
218+
XCTAssertMatch(manifestContents, .contains(#".tvOS(.v13)"#))
219+
XCTAssertMatch(manifestContents, .contains(#".watchOS(.v6)"#))
220+
XCTAssertMatch(manifestContents, .contains(#".macCatalyst(.v13)"#))
211221
XCTAssertMatch(manifestContents, .contains(#"swift-testing.git", from: "0.2.0""#))
212222
XCTAssertMatch(manifestContents, .contains(#".product(name: "Testing", package: "swift-testing")"#))
213223

0 commit comments

Comments
 (0)