Merge pull request #898 from apple/mracek/format-sdk-version-as-two-or-three-components

Format SDK versions in -target-sdk-version as major.minor when patch number is zero

Author: kubamracek

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -346,11 +346,11 @@ public final class DarwinToolchain: Toolchain {
           let sdkInfo = getTargetSDKInfo(sdkPath: sdkPath) else { return }
 
     commandLine.append(.flag("-target-sdk-version"))
-    commandLine.append(.flag(sdkInfo.sdkVersion(for: frontendTargetInfo.target.triple).description))
+    commandLine.append(.flag(sdkInfo.sdkVersion(for: frontendTargetInfo.target.triple).sdkVersionString))
 
     if let targetVariantTriple = frontendTargetInfo.targetVariant?.triple {
       commandLine.append(.flag("-target-variant-sdk-version"))
-      commandLine.append(.flag(sdkInfo.sdkVersion(for: targetVariantTriple).description))
+      commandLine.append(.flag(sdkInfo.sdkVersion(for: targetVariantTriple).sdkVersionString))
     }
 
     if driver.isFrontendArgSupported(.targetSdkName) &&
@@ -382,3 +382,12 @@ extension Diagnostic.Message {
       )
     }
 }
+
+private extension Version {
+  var sdkVersionString: String {
+    if patch == 0 && prereleaseIdentifiers.isEmpty && buildMetadataIdentifiers.isEmpty {
+      return "\(major).\(minor)"
+    }
+    return self.description
+  }
+}

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -3268,7 +3268,7 @@ final class SwiftDriverTests: XCTestCase {
         XCTAssertEqual(frontendJobs[0].kind, .compile)
         XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
           .flag("-target-sdk-version"),
-          .flag("10.15.0")
+          .flag("10.15")
         ]))
         if driver.isFrontendArgSupported(.targetSdkName) {
           XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
@@ -3295,9 +3295,9 @@ final class SwiftDriverTests: XCTestCase {
         XCTAssertEqual(frontendJobs[0].kind, .compile)
         XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
           .flag("-target-sdk-version"),
-          .flag("10.15.0"),
+          .flag("10.15"),
           .flag("-target-variant-sdk-version"),
-          .flag("13.1.0"),
+          .flag("13.1"),
         ]))
         XCTAssertEqual(frontendJobs[1].kind, .link)
         XCTAssertTrue(frontendJobs[1].commandLine.contains(subsequence: [
@@ -3324,7 +3324,7 @@ final class SwiftDriverTests: XCTestCase {
           .flag("-target-sdk-version"),
           .flag("10.15.4"),
           .flag("-target-variant-sdk-version"),
-          .flag("13.4.0")
+          .flag("13.4")
         ]))
         if driver.isFrontendArgSupported(.targetSdkName) {
           XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
@@ -3355,7 +3355,7 @@ final class SwiftDriverTests: XCTestCase {
         XCTAssertEqual(frontendJobs[0].kind, .compile)
         XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
           .flag("-target-sdk-version"),
-          .flag("13.4.0"),
+          .flag("13.4"),
           .flag("-target-variant-sdk-version"),
           .flag("10.15.4")
         ]))