Merge pull request #2638 from aciidb0mb3r/plumb-options

[PackageLoading] Plumb platform options to SupportedPlatforms

Author: aciidgh

Sources/PackageLoading/PackageBuilder.swift

@@ -848,7 +848,8 @@ public final class PackageBuilder {
 
             let supportedPlatform = SupportedPlatform(
                 platform: platformRegistry.platformByName[platform.platformName]!,
-                version: PlatformVersion(platform.version)
+                version: PlatformVersion(platform.version),
+                options: platform.options
             )
 
             supportedPlatforms.append(supportedPlatform)
@@ -863,7 +864,8 @@ public final class PackageBuilder {
 
             let supportedPlatform = SupportedPlatform(
                 platform: platform,
-                version: platform.oldestSupportedVersion
+                version: platform.oldestSupportedVersion,
+                options: []
             )
 
             supportedPlatforms.append(supportedPlatform)

Sources/PackageModel/Platform.swift

@@ -116,8 +116,12 @@ public struct SupportedPlatform {
     /// The minimum required version for this platform.
     public let version: PlatformVersion
 
-    public init(platform: Platform, version: PlatformVersion) {
+    /// The options declared by the platform.
+    public let options: [String]
+
+    public init(platform: Platform, version: PlatformVersion, options: [String]) {
         self.platform = platform
         self.version = version
+        self.options = options
     }
 }

Tests/PackageLoadingTests/PackageBuilderTests.swift

@@ -1507,7 +1507,7 @@ class PackageBuilderTests: XCTestCase {
         var manifest = Manifest.createManifest(
             name: "pkg",
             platforms: [
-                PlatformDescription(name: "macos", version: "10.12"),
+                PlatformDescription(name: "macos", version: "10.12", options: ["option1"]),
             ],
             v: .v5,
             targets: [
@@ -1529,12 +1529,20 @@ class PackageBuilderTests: XCTestCase {
         PackageBuilderTester(manifest, in: fs) { package, _ in
             package.checkModule("foo") { t in
                 t.checkPlatforms(expectedPlatforms)
+                t.checkPlatformOptions(.macOS, options: ["option1"])
+                t.checkPlatformOptions(.iOS, options: [])
+
             }
             package.checkModule("bar") { t in
                 t.checkPlatforms(expectedPlatforms)
+                t.checkPlatformOptions(.macOS, options: ["option1"])
+                t.checkPlatformOptions(.iOS, options: [])
+
             }
             package.checkModule("cbar") { t in
                 t.checkPlatforms(expectedPlatforms)
+                t.checkPlatformOptions(.macOS, options: ["option1"])
+                t.checkPlatformOptions(.iOS, options: [])
             }
         }
 
@@ -2133,6 +2141,11 @@ final class PackageBuilderTester {
             let targetPlatforms = Dictionary(uniqueKeysWithValues: target.platforms.map({ ($0.platform.name, $0.version.versionString) }))
             XCTAssertEqual(platforms, targetPlatforms, file: file, line: line)
         }
+
+        func checkPlatformOptions(_ platform: PackageModel.Platform, options: [String], file: StaticString = #file, line: UInt = #line) {
+            let platform = target.getSupportedPlatform(for: platform)
+            XCTAssertEqual(platform?.options, options, file: file, line: line)
+        }
     }
 
     final class ModuleDependencyResult {