yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-08-17 00:30:29 +03:00
Code Issues Projects Releases Wiki Activity

Make sure to create parent group structure for local packages (#1417)

Browse Source 
* Make sure to create parent group structure for local packages

* Remove redundant localPackageGroup variable

---------

Co-authored-by: Jaap Manenschijn <jaap.maneschijn@rabobank.nl>
This commit is contained in:
Jaap Manenschijn 2024-02-14 10:18:16 +01:00 committed by GitHub
parent 19109ac8c1
commit 54139090a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,6 +9,8 @@
- Added support for String Catalogs (`.xcstrings`) #1421 @nicolasbosi95
- Fixed custom local package groups not being created #1416 @JaapManenschijn
## 2.38.0
### Added

25
Sources/XcodeGenKit/SourceGenerator.swift
View File

@ -18,7 +18,6 @@ class SourceGenerator {
private var fileReferencesByPath: [String: PBXFileElement] = [:]
private var groupsByPath: [Path: PBXGroup] = [:]
private var variantGroupsByPath: [Path: PBXVariantGroup] = [:]
private var localPackageGroup: PBXGroup?
private let project: Project
let pbxProj: PBXProj
@ -54,19 +53,11 @@ class SourceGenerator {
}
func createLocalPackage(path: Path, group: Path?) throws {
var pbxGroup: PBXGroup?
if let location = group {
let fullLocationPath = project.basePath + location
pbxGroup = getGroup(path: fullLocationPath, mergingChildren: [], createIntermediateGroups: true, hasCustomParent: false, isBaseGroup: true)
var parentGroup: String = project.options.localPackagesGroup ?? "Packages"
if let group {
parentGroup = group.string
}
if localPackageGroup == nil && group == nil {
let groupName = project.options.localPackagesGroup ?? "Packages"
localPackageGroup = addObject(PBXGroup(sourceTree: .sourceRoot, name: groupName))
rootGroups.insert(localPackageGroup!)
}
let absolutePath = project.basePath + path.normalize()
// Get the local package's relative path from the project root
@ -80,11 +71,9 @@ class SourceGenerator {
path: fileReferencePath
)
)
if let pbxGroup = pbxGroup {
pbxGroup.children.append(fileReference)
} else {
localPackageGroup!.children.append(fileReference)
}
let parentGroups = parentGroup.components(separatedBy: "/")
createParentGroups(parentGroups, for: fileReference)
}
/// Collects an array complete of all `SourceFile` objects that make up the target based on the provided `TargetSource` definitions.

2
Tests/Fixtures/SPM/SPM.xcodeproj/project.pbxproj
View File

@ -143,7 +143,7 @@
979AE1767E2AF6B3B9D7F13D /* FooFeature */,
);
name = Packages;
sourceTree = SOURCE_ROOT;
sourceTree = "<group>";
};
CF3BD77AEAA56553289456BA /* SPMTests */ = {
isa = PBXGroup;

14
Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
View File

@ -1610,7 +1610,8 @@ class ProjectGeneratorTests: XCTestCase {
]
)
let project = Project(name: "test", targets: [app], packages: ["XcodeGen": .local(path: "../XcodeGen", group: "Packages/Feature")])
let customLocalPackageGroup = "Packages/Feature"
let project = Project(name: "test", targets: [app], packages: ["XcodeGen": .local(path: "../XcodeGen", group: customLocalPackageGroup)])
let pbxProject = try project.generatePbxProj(specValidate: false)
let nativeTarget = try unwrap(pbxProject.nativeTargets.first(where: { $0.name == app.name }))
@ -1619,6 +1620,17 @@ class ProjectGeneratorTests: XCTestCase {
let frameworkPhases = nativeTarget.buildPhases.compactMap { $0 as? PBXFrameworksBuildPhase }
let packagesGroup = try unwrap(pbxProject.groups.first(where: { $0.name == "Packages" }))
let featureGroup = try unwrap(pbxProject.groups.first(where: { $0.name == "Feature" }))
guard featureGroup.parent?.uuid == packagesGroup.uuid else {
return XCTFail("Packages group should be parent of Feature group")
}
guard localPackageFile.parent?.uuid == featureGroup.uuid else {
return XCTFail("Packages group should be parent of Feature group")
}
guard let frameworkPhase = frameworkPhases.first else {
return XCTFail("frameworkPhases should have more than one")
}