Skip to content

Commit 3af5072

Browse files
bnbarhambnbarham
authored
Merge pull request #879 from bnbarham/13-to-13.1-macabi
Update maccatalyst 13.0 target minimum to 13.1
2 parents dc27691 + 5c69a02 commit 3af5072

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎Sources/SwiftDriver/Utilities/Triple+Platforms.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ extension Triple {
228228
return Version(14, 0, 0)
229229
}
230230

231-
// Mac Catalyst was introduced with an iOS deployment target of 13.0;
231+
// Mac Catalyst was introduced with an iOS deployment target of 13.1;
232232
// the linker doesn't want to see a deployment target before that.
233233
if _iOSVersion.major < 13 {
234-
return Version(13, 0, 0)
234+
return Version(13, 1, 0)
235235
}
236236

237237
return _iOSVersion

‎Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ final class SwiftDriverTests: XCTestCase {
11731173

11741174
do {
11751175
// macOS catalyst target
1176-
var driver = try Driver(args: commonArgs + ["-emit-library", "-target", "x86_64-apple-ios13.0-macabi"], env: env)
1176+
var driver = try Driver(args: commonArgs + ["-emit-library", "-target", "x86_64-apple-ios13.1-macabi"], env: env)
11771177
let plannedJobs = try driver.planBuild()
11781178

11791179
XCTAssertEqual(3, plannedJobs.count)
@@ -1186,8 +1186,8 @@ final class SwiftDriverTests: XCTestCase {
11861186
XCTAssertTrue(cmd.contains(.flag("-dylib")))
11871187
XCTAssertTrue(cmd.contains(.flag("-arch")))
11881188
XCTAssertTrue(cmd.contains(.flag("x86_64")))
1189-
XCTAssertTrue(cmd.contains(subsequence: ["-platform_version", "mac-catalyst", "13.0.0"]))
1190-
XCTAssertTrue(cmd.contains(.flag("13.0.0")))
1189+
XCTAssertTrue(cmd.contains(subsequence: ["-platform_version", "mac-catalyst", "13.1.0"]))
1190+
XCTAssertTrue(cmd.contains(.flag("13.1.0")))
11911191
XCTAssertEqual(linkJob.outputs[0].file, try VirtualPath(path: "libTest.dylib"))
11921192

11931193
XCTAssertFalse(cmd.contains(.flag("-static")))
@@ -2639,57 +2639,57 @@ final class SwiftDriverTests: XCTestCase {
26392639

26402640
func testTargetVariant() throws {
26412641
do {
2642-
var driver = try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-ios13.0-macabi", "-target-variant", "x86_64-apple-macosx10.14", "foo.swift"])
2642+
var driver = try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-ios13.1-macabi", "-target-variant", "x86_64-apple-macosx10.14", "foo.swift"])
26432643
let plannedJobs = try driver.planBuild()
26442644
XCTAssertEqual(plannedJobs.count, 1)
26452645

26462646
XCTAssertEqual(plannedJobs[0].kind, .compile)
26472647
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target")))
2648-
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.0-macabi")))
2648+
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.1-macabi")))
26492649
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target-variant")))
26502650
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-macosx10.14")))
26512651
}
26522652

26532653
do {
2654-
var driver = try Driver(args: ["swiftc", "-emit-library", "-target", "x86_64-apple-ios13.0-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-module-name", "foo", "foo.swift"])
2654+
var driver = try Driver(args: ["swiftc", "-emit-library", "-target", "x86_64-apple-ios13.1-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-module-name", "foo", "foo.swift"])
26552655
let plannedJobs = try driver.planBuild()
26562656
XCTAssertEqual(plannedJobs.count, 2)
26572657

26582658
XCTAssertEqual(plannedJobs[0].kind, .compile)
26592659
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target")))
2660-
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.0-macabi")))
2660+
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.1-macabi")))
26612661
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target-variant")))
26622662
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-macosx10.14")))
26632663

26642664
XCTAssertEqual(plannedJobs[1].kind, .link)
26652665
XCTAssertTrue(plannedJobs[1].commandLine.contains(subsequence: [
2666-
"-platform_version", "mac-catalyst", "13.0.0"]))
2666+
"-platform_version", "mac-catalyst", "13.1.0"]))
26672667
XCTAssertTrue(plannedJobs[1].commandLine.contains(subsequence: [
26682668
"-platform_version", "macos", "10.14.0"]))
26692669
}
26702670

26712671
// Test -target-variant is passed to generate pch job
26722672
do {
2673-
var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-ios13.0-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-enable-bridging-pch", "-import-objc-header", "TestInputHeader.h", "foo.swift"])
2673+
var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-ios13.1-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-enable-bridging-pch", "-import-objc-header", "TestInputHeader.h", "foo.swift"])
26742674
let plannedJobs = try driver.planBuild()
26752675
XCTAssertEqual(plannedJobs.count, 3)
26762676

26772677
XCTAssertEqual(plannedJobs[0].kind, .generatePCH)
26782678
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-emit-pch")))
26792679
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target")))
2680-
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.0-macabi")))
2680+
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-ios13.1-macabi")))
26812681
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target-variant")))
26822682
XCTAssert(plannedJobs[0].commandLine.contains(.flag("x86_64-apple-macosx10.14")))
26832683

26842684
XCTAssertEqual(plannedJobs[1].kind, .compile)
26852685
XCTAssert(plannedJobs[1].commandLine.contains(.flag("-target")))
2686-
XCTAssert(plannedJobs[1].commandLine.contains(.flag("x86_64-apple-ios13.0-macabi")))
2686+
XCTAssert(plannedJobs[1].commandLine.contains(.flag("x86_64-apple-ios13.1-macabi")))
26872687
XCTAssert(plannedJobs[1].commandLine.contains(.flag("-target-variant")))
26882688
XCTAssert(plannedJobs[1].commandLine.contains(.flag("x86_64-apple-macosx10.14")))
26892689

26902690
XCTAssertEqual(plannedJobs[2].kind, .link)
26912691
XCTAssertTrue(plannedJobs[2].commandLine.contains(subsequence: [
2692-
"-platform_version", "mac-catalyst", "13.0.0"]))
2692+
"-platform_version", "mac-catalyst", "13.1.0"]))
26932693
XCTAssertTrue(plannedJobs[2].commandLine.contains(subsequence: [
26942694
"-platform_version", "macos", "10.14.0"]))
26952695
}
@@ -3084,7 +3084,7 @@ final class SwiftDriverTests: XCTestCase {
30843084
do {
30853085
var driver = try Driver(args: ["swiftc",
30863086
"-target", "x86_64-apple-macosx10.14",
3087-
"-target-variant", "x86_64-apple-ios13.0-macabi",
3087+
"-target-variant", "x86_64-apple-ios13.1-macabi",
30883088
"-sdk", sdk1.description,
30893089
"foo.swift"])
30903090
let frontendJobs = try driver.planBuild()
@@ -3103,15 +3103,15 @@ final class SwiftDriverTests: XCTestCase {
31033103
.flag("10.15.0"),
31043104
.flag("-platform_version"),
31053105
.flag("mac-catalyst"),
3106-
.flag("13.0.0"),
3106+
.flag("13.1.0"),
31073107
.flag("13.1.0"),
31083108
]))
31093109
}
31103110

31113111
do {
31123112
var driver = try Driver(args: ["swiftc",
31133113
"-target", "x86_64-apple-macosx10.14",
3114-
"-target-variant", "x86_64-apple-ios13.0-macabi",
3114+
"-target-variant", "x86_64-apple-ios13.1-macabi",
31153115
"-sdk", sdk2.description,
31163116
"foo.swift"])
31173117
let frontendJobs = try driver.planBuild()
@@ -3130,15 +3130,15 @@ final class SwiftDriverTests: XCTestCase {
31303130
.flag("10.15.4"),
31313131
.flag("-platform_version"),
31323132
.flag("mac-catalyst"),
3133-
.flag("13.0.0"),
3133+
.flag("13.1.0"),
31343134
.flag("13.4.0"),
31353135
]))
31363136
}
31373137

31383138
do {
31393139
var driver = try Driver(args: ["swiftc",
31403140
"-target-variant", "x86_64-apple-macosx10.14",
3141-
"-target", "x86_64-apple-ios13.0-macabi",
3141+
"-target", "x86_64-apple-ios13.1-macabi",
31423142
"-sdk", sdk2.description,
31433143
"foo.swift"])
31443144
let frontendJobs = try driver.planBuild()
@@ -3153,7 +3153,7 @@ final class SwiftDriverTests: XCTestCase {
31533153
XCTAssertTrue(frontendJobs[1].commandLine.contains(subsequence: [
31543154
.flag("-platform_version"),
31553155
.flag("mac-catalyst"),
3156-
.flag("13.0.0"),
3156+
.flag("13.1.0"),
31573157
.flag("13.4.0"),
31583158
.flag("-platform_version"),
31593159
.flag("macos"),
@@ -3261,7 +3261,7 @@ final class SwiftDriverTests: XCTestCase {
32613261
XCTAssertTrue(frontendJobs[1].commandLine.contains(subsequence: [
32623262
.flag("-platform_version"),
32633263
.flag("mac-catalyst"),
3264-
.flag("13.0.0"),
3264+
.flag("13.1.0"),
32653265
]))
32663266
}
32673267

@@ -3824,7 +3824,7 @@ final class SwiftDriverTests: XCTestCase {
38243824
}
38253825

38263826
do {
3827-
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-apple-ios13.0-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-sdk", "bar", "-resource-dir", "baz"])
3827+
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-apple-ios13.1-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-sdk", "bar", "-resource-dir", "baz"])
38283828
let plannedJobs = try driver.planBuild()
38293829
XCTAssertTrue(plannedJobs.count == 1)
38303830
let job = plannedJobs[0]
@@ -5081,7 +5081,7 @@ final class SwiftDriverTests: XCTestCase {
50815081
let mockSDKPath : String = testInputsPath + "/mock-sdk.sdk"
50825082

50835083
do {
5084-
var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-ios13.0-macabi", "foo.swift", "-sdk", mockSDKPath])
5084+
var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-ios13.1-macabi", "foo.swift", "-sdk", mockSDKPath])
50855085
let plannedJobs = try driver.planBuild()
50865086
let job = plannedJobs[0]
50875087
XCTAssertTrue(job.commandLine.contains(.flag("-prebuilt-module-cache-path")))

0 commit comments

Comments
 (0)