Skip to content

Commit e1e9b80

Browse files
committed
Account for Simulator platforms when checking if the provided SDK is too old
1 parent 678f654 commit e1e9b80

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

Sources/SwiftDriver/Driver/Driver.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,10 +2051,10 @@ extension Driver {
20512051
}
20522052
if sdkInfo.canonicalName.hasPrefix("macos") {
20532053
return sdkVersion < Version(10, 15, 0)
2054-
} else if sdkInfo.canonicalName.hasPrefix("iphoneos") ||
2055-
sdkInfo.canonicalName.hasPrefix("appletvos") {
2054+
} else if sdkInfo.canonicalName.hasPrefix("iphone") ||
2055+
sdkInfo.canonicalName.hasPrefix("appletv") {
20562056
return sdkVersion < Version(13, 0, 0)
2057-
} else if sdkInfo.canonicalName.hasPrefix("watchos") {
2057+
} else if sdkInfo.canonicalName.hasPrefix("watch") {
20582058
return sdkVersion < Version(6, 0, 0)
20592059
} else {
20602060
return false
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"Version": "7.0",
3+
"CanonicalName": "iphonesimulator7.0"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"Version": "6.0",
3+
"CanonicalName": "watchsimulator6.0"
4+
}

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2775,6 +2775,7 @@ final class SwiftDriverTests: XCTestCase {
27752775
try checkSDKUnsupported(sdkDirName: "MacOSX7.17.sdk")
27762776
try checkSDKUnsupported(sdkDirName: "MacOSX10.14.Internal.sdk")
27772777
try checkSDKUnsupported(sdkDirName: "iPhoneOS7.sdk")
2778+
try checkSDKUnsupported(sdkDirName: "iPhoneSimulator7.sdk")
27782779
try checkSDKUnsupported(sdkDirName: "iPhoneOS12.99.sdk")
27792780
try checkSDKUnsupported(sdkDirName: "watchOS2.0.sdk")
27802781
try checkSDKUnsupported(sdkDirName: "watchOS3.0.sdk")
@@ -2787,6 +2788,7 @@ final class SwiftDriverTests: XCTestCase {
27872788
try checkSDKOkay(sdkDirName: "iPhoneOS13.0.sdk")
27882789
try checkSDKOkay(sdkDirName: "tvOS13.0.sdk")
27892790
try checkSDKOkay(sdkDirName: "watchOS6.0.sdk")
2791+
try checkSDKOkay(sdkDirName: "watchSimulator6.0.sdk")
27902792
try checkSDKOkay(sdkDirName: "iPhoneOS.sdk")
27912793
try checkSDKOkay(sdkDirName: "tvOS.sdk")
27922794
try checkSDKOkay(sdkDirName: "watchOS.sdk")

0 commit comments

Comments
 (0)