Merge pull request #333 from tuist/encode_target_attributes

Encode PBXObject reference in target attributes
tuist · Oct 10, 2018 · 268f936 · 268f936
2 parents 7017b45 + b87f4e3
commit 268f936
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## next version
 
+### Added
+- Added ability to pass in a `PBXObject` into the `PBXProject.targetAttributes` dictionary, which will be encoded into its UUID. Can be used for `TestTargetID` https://github.com/tuist/xcodeproj/pull/333 by @yonaskolb.
+
 ### Changed
 - Changed `XCScheme.BuildableReference` init to make `blueprint` a `PBXObject` and added a `setBlueprint(:)` function https://github.com/tuist/xcodeproj/pull/320 by @yonaskolb.
 - Bump AEXML version to 4.3.3 https://github.com/tuist/xcodeproj/pull/310 by @pepibumur.

diff --git a/Sources/xcodeproj/Objects/Project/PBXProject.swift b/Sources/xcodeproj/Objects/Project/PBXProject.swift
@@ -314,7 +314,11 @@ extension PBXProject: PlistSerializable {
         if !targetAttributeReferences.isEmpty {
             // merge target attributes
             var plistTargetAttributes: [String: Any] = [:]
-            targetAttributeReferences.forEach({ plistTargetAttributes[$0.key.value] = $0.value })
+            for (reference, value) in targetAttributeReferences {
+                plistTargetAttributes[reference.value] = value.mapValues { value in
+                    (value as? PBXObject)?.reference.value ?? value
+                }
+            }
             plistAttributes[PBXProject.targetAttributesKey] = plistTargetAttributes
         }
         dictionary["attributes"] = plistAttributes.plist()

diff --git a/Tests/xcodeprojTests/Objects/Project/PBXProjectTests.swift b/Tests/xcodeprojTests/Objects/Project/PBXProjectTests.swift
@@ -4,7 +4,10 @@ import XCTest
 final class PBXProjectTests: XCTestCase {
     func test_attributes() throws {
         let target = PBXTarget(name: "")
-        target.reference.fix("test")
+        target.reference.fix("app")
+
+        let testTarget = PBXTarget(name: "")
+        testTarget.reference.fix("test")
 
         let project = PBXProject(name: "",
                                  buildConfigurationList: XCConfigurationList(),
@@ -13,15 +16,16 @@ final class PBXProjectTests: XCTestCase {
                                  attributes: ["LastUpgradeCheck": "0940"],
                                  targetAttributes: [target: ["TestTargetID": "123"]])
 
-        project.setTargetAttributes(["custom": "abc"], target: target)
+        project.setTargetAttributes(["custom": "abc", "TestTargetID": testTarget], target: target)
 
         let plist = try project.plistKeyAndValue(proj: PBXProj(), reference: "")
         let attributes = plist.value.dictionary?["attributes"]?.dictionary ?? [:]
 
         let expectedAttributes: [CommentedString: PlistValue] = [
             "LastUpgradeCheck": "0940",
-            "TargetAttributes": ["test": [
+            "TargetAttributes": ["app": [
                 "custom": "abc",
+                "TestTargetID": "test"
             ]],
         ]
         XCTAssertEqual(attributes, expectedAttributes)