Address merge conflicts

tuist · Dec 9, 2019 · 8b2e5ed · 8b2e5ed
1 parent 9c21445
commit 8b2e5ed
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/Sources/TuistCore/Graph/GraphLoader.swift b/Sources/TuistCore/Graph/GraphLoader.swift
@@ -187,6 +187,10 @@ public class GraphLoader: GraphLoading {
                                        swiftModuleMap: swiftModuleMap,
                                        libraryPath: libraryPath,
                                        graphLoaderCache: graphLoaderCache)
+        // XCFramework
+        case let .xcFramework(frameworkPath):
+            return try loadXCFrameworkNode(path: frameworkPath, graphLoaderCache: graphLoaderCache)
+
         // System SDK
         case let .sdk(name, status):
             return try SDKNode(name: name, platform: platform, status: status)
@@ -260,4 +264,16 @@ public class GraphLoader: GraphLoading {
         graphLoaderCache.add(cocoapods: node)
         return node
     }
+
+    /// Loads the XCFramework node. If it it exists in the cache, it returns it from the cache.
+    /// Otherwise, it initializes it, stores it in the cache, and then returns it.
+    ///
+    /// - Parameters:
+    ///   - xcframeworkPath: Path to the .xcframework.
+    ///   - graphLoaderCache: Graph loader cache.
+    fileprivate func loadXCFrameworkNode(
+        path: AbsolutePath,
+        graphLoaderCache: GraphLoaderCaching) throws -> XCFrameworkNode {
+        return try XCFrameworkParser.parse(path: path, cache: graphLoaderCache)
+    }
 }
diff --git a/Sources/TuistGenerator/Generator/LinkGenerator.swift b/Sources/TuistGenerator/Generator/LinkGenerator.swift
@@ -169,7 +169,19 @@ final class LinkGenerator: LinkGenerating {
 
         try dependencies.forEach { dependency in
             if case let GraphDependencyReference.absolute(path) = dependency {
-                precompiledFrameworkPaths.append(path)
+                if path.extension == "xcframework" {
+                    guard let fileRef = fileElements.file(path: path) else {
+                        throw LinkGeneratorError.missingReference(path: path)
+                    }
+                    let buildFile = PBXBuildFile(
+                        file: fileRef,
+                        settings: ["ATTRIBUTES": ["CodeSignOnCopy"]]
+                    )
+                    pbxproj.add(object: buildFile)
+                    embedPhase.files?.append(buildFile)
+                } else {
+                    precompiledFrameworkPaths.append(path)
+                }
             } else if case let GraphDependencyReference.product(target, _) = dependency {
                 guard let fileRef = fileElements.product(target: target) else {
                     throw LinkGeneratorError.missingProduct(name: target)

diff --git a/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift
@@ -91,8 +91,8 @@ final class LinkGeneratorErrorTests: XCTestCase {
 
     func test_generateEmbedPhase_setupEmbedFrameworksBuildPhase_whenXCFrameworkIsPresent() throws {
         // Given
-        var dependencies: [DependencyReference] = []
-        dependencies.append(DependencyReference.absolute(AbsolutePath("/Frameworks/Test.xcframework")))
+        var dependencies: [GraphDependencyReference] = []
+        dependencies.append(GraphDependencyReference.absolute(AbsolutePath("/Frameworks/Test.xcframework")))
         let pbxproj = PBXProj()
         let pbxTarget = PBXNativeTarget(name: "Test")
         let sourceRootPath = AbsolutePath("/")