Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue that it is not possible to remove a remote package #803

Merged
merged 2 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions Sources/XcodeProj/Objects/Project/PBXProject.swift
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,7 @@ public final class PBXProject: PBXObject {
/// Remote Swift packages.
public var remotePackages: [XCRemoteSwiftPackageReference] {
set {
var finalReferences: [PBXObjectReference] = packageReferences ?? []
let newReferences = newValue.references()
for reference in newReferences {
if !finalReferences.contains(reference) {
finalReferences.append(reference)
}
}
packageReferences = finalReferences
setPackageReferences(newValue)
}
get {
packageReferences?.objects() ?? []
Expand All @@ -154,20 +147,24 @@ public final class PBXProject: PBXObject {
/// Local Swift packages.
public var localPackages: [XCLocalSwiftPackageReference] {
set {
var finalReferences: [PBXObjectReference] = packageReferences ?? []
let newReferences = newValue.references()
for reference in newReferences {
if !finalReferences.contains(reference) {
finalReferences.append(reference)
}
}
packageReferences = finalReferences
setPackageReferences(newValue)
}
get {
packageReferences?.objects() ?? []
}
}

private func setPackageReferences<T: PBXContainerItem>(_ references: [T]) {
luispadron marked this conversation as resolved.
Show resolved Hide resolved
let newReferences = references.references()
var finalReferences: [PBXObjectReference] = packageReferences?.filter { !($0.getObject() is T) } ?? []
for reference in newReferences {
if !finalReferences.contains(reference) {
finalReferences.append(reference)
}
}
packageReferences = finalReferences
}

/// Sets the attributes for the given target.
///
/// - Parameters:
Expand Down
40 changes: 40 additions & 0 deletions Tests/XcodeProjTests/Objects/Project/PBXProjectTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,46 @@ final class PBXProjectTests: XCTestCase {
PBXProjError.frameworksBuildPhaseNotFound(targetName: target.name))
}

func test_removeRemotePackage() throws {
// Given
let objects = PBXObjects(objects: [])

let buildPhase = PBXFrameworksBuildPhase(
files: [],
inputFileListPaths: nil,
outputFileListPaths: nil, buildActionMask: PBXBuildPhase.defaultBuildActionMask,
runOnlyForDeploymentPostprocessing: true
)
let target = PBXNativeTarget(name: "Target",
buildConfigurationList: nil,
buildPhases: [buildPhase])
objects.add(object: target)

let configurationList = XCConfigurationList.fixture()
let mainGroup = PBXGroup.fixture()
objects.add(object: configurationList)
objects.add(object: mainGroup)

let project = PBXProject(name: "Project",
buildConfigurationList: configurationList,
compatibilityVersion: "0",
mainGroup: mainGroup,
targets: [target])

objects.add(object: project)

let _ = try project.addSwiftPackage(repositoryURL: "url",
productName: "Product",
versionRequirement: .branch("main"),
targetName: "Target")

// When
project.remotePackages.removeFirst()

// Then
XCTAssert(project.remotePackages.isEmpty)
}

func test_addSwiftPackage() throws {
// Given
let objects = PBXObjects(objects: [])
Expand Down