Merge pull request #607 from artemcm/SimulatorSDKTooOld

Account for Simulator platforms when checking if the provided SDK is too old

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -2051,10 +2051,10 @@ extension Driver {
     }
     if sdkInfo.canonicalName.hasPrefix("macos") {
       return sdkVersion < Version(10, 15, 0)
-    } else if sdkInfo.canonicalName.hasPrefix("iphoneos") ||
-                sdkInfo.canonicalName.hasPrefix("appletvos") {
+    } else if sdkInfo.canonicalName.hasPrefix("iphone") ||
+                sdkInfo.canonicalName.hasPrefix("appletv") {
       return sdkVersion < Version(13, 0, 0)
-    } else if sdkInfo.canonicalName.hasPrefix("watchos") {
+    } else if sdkInfo.canonicalName.hasPrefix("watch") {
       return sdkVersion < Version(6, 0, 0)
     } else {
       return false

TestInputs/SDKChecks/iPhoneSimulator7.sdk/SDKSettings.json

@@ -0,0 +1,4 @@
+{
+	"Version": "7.0",
+	"CanonicalName": "iphonesimulator7.0"
+}

TestInputs/SDKChecks/watchSimulator6.0.sdk/SDKSettings.json

@@ -0,0 +1,4 @@
+{
+	"Version": "6.0",
+	"CanonicalName": "watchsimulator6.0"
+}

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -2775,6 +2775,7 @@ final class SwiftDriverTests: XCTestCase {
     try checkSDKUnsupported(sdkDirName: "MacOSX7.17.sdk")
     try checkSDKUnsupported(sdkDirName: "MacOSX10.14.Internal.sdk")
     try checkSDKUnsupported(sdkDirName: "iPhoneOS7.sdk")
+    try checkSDKUnsupported(sdkDirName: "iPhoneSimulator7.sdk")
     try checkSDKUnsupported(sdkDirName: "iPhoneOS12.99.sdk")
     try checkSDKUnsupported(sdkDirName: "watchOS2.0.sdk")
     try checkSDKUnsupported(sdkDirName: "watchOS3.0.sdk")
@@ -2787,6 +2788,7 @@ final class SwiftDriverTests: XCTestCase {
     try checkSDKOkay(sdkDirName: "iPhoneOS13.0.sdk")
     try checkSDKOkay(sdkDirName: "tvOS13.0.sdk")
     try checkSDKOkay(sdkDirName: "watchOS6.0.sdk")
+    try checkSDKOkay(sdkDirName: "watchSimulator6.0.sdk")
     try checkSDKOkay(sdkDirName: "iPhoneOS.sdk")
     try checkSDKOkay(sdkDirName: "tvOS.sdk")
     try checkSDKOkay(sdkDirName: "watchOS.sdk")