Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Next Version

### Fixed
- Fix missing productRefGroup in generated projects #1591 @ruslic19

## 2.44.1

### Fixed
Expand Down
1 change: 1 addition & 0 deletions Sources/XcodeGenKit/PBXProjGenerator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ public class PBXProjGenerator {
)
)
derivedGroups.append(productGroup)
pbxProject.productsGroup = productGroup

let sortedProjectReferences = project.projectReferences.sorted { $0.name < $1.name }
let subprojectFileReferences: [PBXFileReference] = sortedProjectReferences.map { projectReference in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
mainGroup = 293D0FF827366B513839236A;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
productRefGroup = AC523591AC7BE9275003D2DB /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
Expand Down
1 change: 1 addition & 0 deletions Tests/Fixtures/SPM/SPM.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@
C6539B364583AE96C18CE377 /* XCLocalSwiftPackageReference "../../.." */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 5D68FDDE55EE935627A1B376 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
mainGroup = 4E8CFA4275C972686621210C;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
productRefGroup = 6BB7980FAF18A93459B051A1 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2460,6 +2460,7 @@
4EDA79334592CBBA0E507AD2 /* XCRemoteSwiftPackageReference "Swinject" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = AC523591AC7BE9275003D2DB /* Products */;
projectDirPath = "";
projectReferences = (
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
mainGroup = 2D08B11F4EE060D112B7BCA1;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
productRefGroup = 5B8D13EAC88739DF2D92F8AE /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
Expand Down
51 changes: 51 additions & 0 deletions Tests/XcodeGenKitTests/PBXProjGeneratorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,57 @@ class PBXProjGeneratorTests: XCTestCase {
}
}

func testProductsGroupIsSet() throws {
let target = Target(name: "TestApp", type: .application, platform: .iOS)
let project = Project(name: "Test", targets: [target])
let projGenerator = PBXProjGenerator(project: project)

let pbxProj = try projGenerator.generate()

let pbxProject = try XCTUnwrap(pbxProj.projects.first)
let productsGroup = try XCTUnwrap(pbxProject.productsGroup)

XCTAssertEqual(productsGroup.name, "Products")
XCTAssertEqual(productsGroup.children.count, 1)

let productReference = try XCTUnwrap(productsGroup.children.first as? PBXFileReference)
XCTAssertEqual(productReference.path, "TestApp.app")
}

func testProductsGroupIsSetWithMultipleTargets() throws {
let appTarget = Target(name: "TestApp", type: .application, platform: .iOS)
let frameworkTarget = Target(name: "TestFramework", type: .framework, platform: .iOS)
let project = Project(name: "Test", targets: [appTarget, frameworkTarget])
let projGenerator = PBXProjGenerator(project: project)

let pbxProj = try projGenerator.generate()

let pbxProject = try XCTUnwrap(pbxProj.projects.first)
let productsGroup = try XCTUnwrap(pbxProject.productsGroup)

XCTAssertEqual(productsGroup.name, "Products")
XCTAssertEqual(productsGroup.children.count, 2)

let productNames = productsGroup.children
.compactMap { $0 as? PBXFileReference }
.compactMap { $0.path }
.sorted()
XCTAssertEqual(productNames, ["TestApp.app", "TestFramework.framework"])
}

func testProductsGroupIsSetWithNoTargets() throws {
let project = Project(name: "Test")
let projGenerator = PBXProjGenerator(project: project)

let pbxProj = try projGenerator.generate()

let pbxProject = try XCTUnwrap(pbxProj.projects.first)
let productsGroup = try XCTUnwrap(pbxProject.productsGroup)

XCTAssertEqual(productsGroup.name, "Products")
XCTAssertEqual(productsGroup.children.count, 0)
}

func testPlatformDependencies() {
describe {
let directoryPath = Path("TestDirectory")
Expand Down
Loading