Change name of field from 'conditionalPlatforms' to 'platforms'

Author: daltonclaybrook

Docs/ProjectSpec.md

@@ -429,7 +429,7 @@ A dependency can be one of a 6 types:
 - [ ] **removeHeaders**: **Bool** - Whether the `removeHeadersOnCopy` setting is applied when embedding the framework. Defaults to true
 - [ ] **weak**: **Bool** - Whether the `Weak` setting is applied when linking the framework. Defaults to false
 - [ ] **platformFilter**: **String** - This field is specific to Mac Catalyst. It corresponds to the "Platforms" dropdown in the Frameworks & Libraries section of Target settings in Xcode. Available options are: **iOS**, **macOS** and **all**. Defaults is **all**
-- [ ] **conditionalPlatforms**: **[[Platform](#platform)]** - List of platforms this dependency should apply to. Defaults to all applicable platforms.
+- [ ] **platforms**: **[[Platform](#platform)]** - List of platforms this dependency should apply to. Defaults to all applicable platforms.
 
 **Implicit Framework options**:
 

Sources/ProjectSpec/Dependency.swift

@@ -16,7 +16,7 @@ public struct Dependency: Equatable {
     public var implicit: Bool = implicitDefault
     public var weakLink: Bool = weakLinkDefault
     public var platformFilter: PlatformFilter = platformFilterDefault
-    public var conditionalPlatforms: Set<Platform>?
+    public var platforms: Set<Platform>?
 
     public init(
         type: DependencyType,
@@ -27,7 +27,7 @@ public struct Dependency: Equatable {
         implicit: Bool = implicitDefault,
         weakLink: Bool = weakLinkDefault,
         platformFilter: PlatformFilter = platformFilterDefault,
-        conditionalPlatforms: Set<Platform>? = nil
+        platforms: Set<Platform>? = nil
     ) {
         self.type = type
         self.reference = reference
@@ -37,7 +37,7 @@ public struct Dependency: Equatable {
         self.implicit = implicit
         self.weakLink = weakLink
         self.platformFilter = platformFilter
-        self.conditionalPlatforms = conditionalPlatforms
+        self.platforms = platforms
     }
 
     public enum PlatformFilter: String, Equatable {
@@ -132,8 +132,8 @@ extension Dependency: JSONObjectConvertible {
             self.platformFilter = .all
         }
 
-        if let conditionalPlatforms: [ProjectSpec.Platform] = jsonDictionary.json(atKeyPath: "conditionalPlatforms") {
-            self.conditionalPlatforms = Set(conditionalPlatforms)
+        if let platforms: [ProjectSpec.Platform] = jsonDictionary.json(atKeyPath: "platforms") {
+            self.platforms = Set(platforms)
         }
     }
 }
@@ -144,7 +144,7 @@ extension Dependency: JSONEncodable {
             "embed": embed,
             "codeSign": codeSign,
             "link": link,
-            "conditionalPlatforms": conditionalPlatforms?.map(\.rawValue).sorted()
+            "platforms": platforms?.map(\.rawValue).sorted()
         ]
 
         if removeHeaders != Dependency.removeHeadersDefault {

Sources/ProjectSpec/Target.swift

@@ -304,7 +304,7 @@ extension Target: NamedJSONDictionaryConvertible {
             let dependencies: [Dependency] = try jsonDictionary.json(atKeyPath: "dependencies", invalidItemBehaviour: .fail)
             self.dependencies = dependencies.filter { [platform] dependency -> Bool in
                 // If unspecified, all platforms are supported
-                guard let platforms = dependency.conditionalPlatforms else { return true }
+                guard let platforms = dependency.platforms else { return true }
                 return platforms.contains(platform)
             }
         }

Tests/Fixtures/TestProject/project.yml

@@ -244,7 +244,7 @@ targets:
       - carthage: Result
       - target: StaticLibrary_ObjC_${platform}
       - target: Framework2_${platform}
-        conditionalPlatforms: [tvOS, watchOS]
+        platforms: [tvOS, watchOS]
 
   Framework2:
     type: framework

Tests/ProjectSpecTests/SpecLoadingTests.swift

@@ -386,8 +386,8 @@ class SpecLoadingTests: XCTestCase {
                         "sdk": "Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework",
                         "root": "DEVELOPER_DIR",
                     ],
-                    ["target": "conditionalMatch", "conditionalPlatforms": ["iOS"]],
-                    ["target": "conditionalMiss", "conditionalPlatforms": ["watchOS"]],
+                    ["target": "conditionalMatch", "platforms": ["iOS"]],
+                    ["target": "conditionalMiss", "platforms": ["watchOS"]],
                 ]
                 let target = try Target(name: "test", jsonDictionary: targetDictionary)
                 try expect(target.dependencies.count) == 8
@@ -398,7 +398,7 @@ class SpecLoadingTests: XCTestCase {
                 try expect(target.dependencies[4]) == Dependency(type: .framework, reference: "path", weakLink: true)
                 try expect(target.dependencies[5]) == Dependency(type: .sdk(root: nil), reference: "Contacts.framework")
                 try expect(target.dependencies[6]) == Dependency(type: .sdk(root: "DEVELOPER_DIR"), reference: "Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework")
-                try expect(target.dependencies[7]) == Dependency(type: .target, reference: "conditionalMatch", conditionalPlatforms: [.iOS])
+                try expect(target.dependencies[7]) == Dependency(type: .target, reference: "conditionalMatch", platforms: [.iOS])
             }
 
             $0.it("parses info plist") {