[PackageDescription4] Add new OS versions in SupportedPlatforms

<rdar://problem/50392890>

(cherry picked from commit 0c0461c)

Author: aciidgh

Sources/PackageDescription4/SupportedPlatforms.swift

@@ -186,6 +186,12 @@ extension SupportedPlatform {
         ///
         /// - Since: First available in PackageDescription 5.0
         public static let v10_14: MacOSVersion = .init(string: "10.14")
+
+        /// macOS 10.15
+        ///
+        /// - Since: First available in PackageDescription 5.1
+        @available(_PackageDescription, introduced: 5.1)
+        public static let v10_15: MacOSVersion = .init(string: "10.15")
     }
 
     public struct TVOSVersion: Encodable, AppleOSVersion {
@@ -218,6 +224,12 @@ extension SupportedPlatform {
         ///
         /// - Since: First available in PackageDescription 5.0
         public static let v12: TVOSVersion = .init(string: "12.0")
+
+        /// tvOS 13.0
+        ///
+        /// - Since: First available in PackageDescription 5.1
+        @available(_PackageDescription, introduced: 5.1)
+        public static let v13: TVOSVersion = .init(string: "13.0")
     }
 
     public struct IOSVersion: Encodable, AppleOSVersion {
@@ -255,6 +267,12 @@ extension SupportedPlatform {
         ///
         /// - Since: First available in PackageDescription 5.0
         public static let v12: IOSVersion = .init(string: "12.0")
+
+        /// iOS 13.0
+        ///
+        /// - Since: First available in PackageDescription 5.1
+        @available(_PackageDescription, introduced: 5.1)
+        public static let v13: IOSVersion = .init(string: "13.0")
     }
 
     public struct WatchOSVersion: Encodable, AppleOSVersion {
@@ -287,6 +305,12 @@ extension SupportedPlatform {
         ///
         /// - Since: First available in PackageDescription 5.0
         public static let v5: WatchOSVersion = .init(string: "5.0")
+
+        /// watchOS 6.0
+        ///
+        /// - Since: First available in PackageDescription 5.1
+        @available(_PackageDescription, introduced: 5.1)
+        public static let v6: WatchOSVersion = .init(string: "6.0")
     }
 }
 

Sources/PackageLoading/ManifestLoader.swift

@@ -70,10 +70,12 @@ extension ToolsVersion {
 
             // Otherwise, return 4.2
             return .v4_2
+        case 5 where minor < 1:
+            return .v5
 
         default:
             // For rest, return the latest manifest version.
-            return .v5
+            return .v5_1
         }
     }
 }

Sources/PackageLoading/PackageBuilder.swift

@@ -367,7 +367,7 @@ public final class PackageBuilder {
             // Emit deprecation notice.
             switch manifest.manifestVersion {
             case .v4: break
-            case .v4_2, .v5:
+            case .v4_2, .v5, .v5_1:
                 diagnostics.emit(
                     data: PackageBuilderDiagnostics.SystemPackageDeprecatedDiagnostic(),
                     location: diagnosticLocation()

Sources/PackageModel/Manifest.swift

@@ -16,6 +16,7 @@ public enum ManifestVersion: String, Codable, CustomStringConvertible {
     case v4
     case v4_2
     case v5
+    case v5_1
 
     /// The Swift language version to use when parsing the manifest file.
     public var swiftLanguageVersion: SwiftLanguageVersion {
@@ -30,6 +31,7 @@ public enum ManifestVersion: String, Codable, CustomStringConvertible {
         case .v4: return .v4
         case .v4_2: return .v4_2
         case .v5: return .v5
+        case .v5_1: return .v5
         }
     }
 
@@ -38,6 +40,7 @@ public enum ManifestVersion: String, Codable, CustomStringConvertible {
         case .v4: return "4"
         case .v4_2: return "4.2"
         case .v5: return "5"
+        case .v5_1: return "5.1"
         }
     }
 
@@ -46,7 +49,7 @@ public enum ManifestVersion: String, Codable, CustomStringConvertible {
         switch self {
         case .v4:
             return RelativePath("4")
-        case .v4_2, .v5:
+        case .v4_2, .v5, .v5_1:
             // PackageDescription 4.2 and 5 are source compatible so they're contained in the same dylib.
             return RelativePath("4_2")
         }

Sources/PackageModel/Sources.swift

@@ -81,7 +81,7 @@ public enum SupportedLanguageExtension: String {
         switch manifestVersion {
         case .v4, .v4_2:
             return alwaysValidExts
-        case .v5:
+        case .v5, .v5_1:
             return alwaysValidExts.union(assemblyExtensions)
         }
     }

Sources/Xcodeproj/pbxproj().swift

@@ -428,7 +428,7 @@ func xcodeProject(
 
         // Assign the deployment target if the package is using the newer manifest version.
         switch package.manifest.manifestVersion {
-        case .v5:
+        case .v5, .v5_1:
             for supportedPlatform in target.underlyingTarget.platforms {
                 let version = supportedPlatform.version.versionString
                 switch supportedPlatform.platform {

Tests/PackageLoadingTests/PD4LoadingTests.swift

@@ -75,13 +75,22 @@ class PackageDescription4LoadingTests: XCTestCase {
         }
 
         let fiveVersions = [
-            "5.1.0", "6.1.100", "5.0.0", "7.0.0",
+            "5.0.0", "5.0.1", "5.0.2",
         ]
 
         for version in fiveVersions {
             let toolsVersion = ToolsVersion(string: version)!
             XCTAssertEqual(toolsVersion.manifestVersion, .v5, version)
         }
+
+        let fiveOneVersions = [
+            "5.1.0", "6.1.100", "5.1.1", "7.0.0",
+        ]
+
+        for version in fiveOneVersions {
+            let toolsVersion = ToolsVersion(string: version)!
+            XCTAssertEqual(toolsVersion.manifestVersion, .v5_1, version)
+        }
     }
 
     func testTrivial() {

Tests/PackageLoadingTests/PD5LoadingTests.swift

@@ -226,6 +226,31 @@ class PackageDescription5LoadingTests: XCTestCase {
         } catch ManifestParseError.runtimeManifestErrors(let errors) {
             XCTAssertEqual(errors, ["supported platforms can't be empty"])
         }
+
+        // Newer OS version.
+        stream = BufferedOutputByteStream()
+        stream <<< """
+            import PackageDescription
+            let package = Package(
+               name: "Foo",
+               platforms: [
+                   .macOS(.v10_15), .iOS(.v13),
+               ]
+            )
+            """
+
+        do {
+            try loadManifestThrowing(stream.bytes) { _ in }
+            XCTFail("Unexpected success")
+        } catch {
+            guard case let ManifestParseError.invalidManifestFormat(message, _) = error else {
+                return XCTFail("\(error)")
+            }
+
+            XCTAssertMatch(message, .contains("error: 'v10_15' is unavailable"))
+            XCTAssertMatch(message, .contains("note: 'v10_15' was introduced in PackageDescription 5.1"))
+            XCTAssertMatch(message, .contains("note: 'v13' was introduced in PackageDescription 5.1"))
+        }
     }
 
     func testBuildSettings() throws {