Fix issue that multiple products of the same package cannot be added (#…

…801) * - Also check for productName when trying to avoid duplicate swift packages * Add equality checks in the unit test when adding a new swift package --------- Co-authored-by: Kevin Pittevils <[email protected]>
tuist · Nov 21, 2023 · 447c159 · 447c159
1 parent 069cdaf
commit 447c159
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Sources/XcodeProj/Objects/Project/PBXProject.swift b/Sources/XcodeProj/Objects/Project/PBXProject.swift
@@ -440,7 +440,7 @@ extension PBXProject {
 
  let productDependency: XCSwiftPackageProductDependency
  // Avoid duplication
- if let product = objects.swiftPackageProductDependencies.first(where: { $0.value.package == reference })?.value {
+ if let product = objects.swiftPackageProductDependencies.first(where: { $0.value.package == reference && $0.value.productName == productName })?.value {
  productDependency = product
  } else {
  productDependency = XCSwiftPackageProductDependency(productName: productName, package: reference)

diff --git a/Tests/XcodeProjTests/Objects/Project/PBXProjectTests.swift b/Tests/XcodeProjTests/Objects/Project/PBXProjectTests.swift
@@ -192,19 +192,30 @@ final class PBXProjectTests: XCTestCase {
  productName: "Product",
  versionRequirement: .branch("main"),
  targetName: secondTarget.name)
-
+ let thirdPackageProduct = try project.addSwiftPackage(repositoryURL: "url",
+ productName: "Product2",
+ versionRequirement: .branch("main"),
+ targetName: target.name)
  // Then
  XCTAssertEqual(packageProduct, secondPackageProduct)
+ XCTAssertEqual(packageProduct, thirdPackageProduct)
  XCTAssertEqual(project.remotePackages.count, 1)
- XCTAssertEqual(target.packageProductDependencies, secondTarget.packageProductDependencies)
+ XCTAssertEqual(target.packageProductDependencies.count, 2)
+ XCTAssertEqual(secondTarget.packageProductDependencies.count, 1)
  XCTAssertNotEqual(buildPhase.files?.first?.hashValue, secondBuildPhase.files?.first?.hashValue)
- XCTAssertEqual(objects.swiftPackageProductDependencies.count, 1)
+ XCTAssertEqual(objects.swiftPackageProductDependencies.count, 2)
 
  XCTAssertThrowsSpecificError(try project.addSwiftPackage(repositoryURL: "url",
  productName: "Product",
  versionRequirement: .branch("second-main"),
  targetName: secondTarget.name),
  PBXProjError.multipleRemotePackages(productName: "Product"))
+
+ XCTAssertThrowsSpecificError(try project.addSwiftPackage(repositoryURL: "url",
+ productName: "Product2",
+ versionRequirement: .branch("second-main"),
+ targetName: target.name),
+ PBXProjError.multipleRemotePackages(productName: "Product2"))
  }
 
  func test_addLocalSwiftPackage_duplication() throws {