Include folder (SPM packages) in group sorting logic (#1466)

This commit is contained in:
John Flanagan
2024-05-17 08:14:20 -05:00
committed by GitHub
parent 274ce7342c
commit d99e448647
2 changed files with 96 additions and 2 deletions
+6 -2
View File
@@ -631,8 +631,8 @@ public class PBXProjGenerator {
}
if let order = groupOrdering?.order {
let files = group.children.filter { $0 is PBXFileReference }
var groups = group.children.filter { $0 is PBXGroup }
let files = group.children.filter { !$0.isGroupOrFolder }
var groups = group.children.filter { $0.isGroupOrFolder }
var filteredGroups = [PBXFileElement]()
@@ -1626,6 +1626,10 @@ extension Platform {
}
extension PBXFileElement {
/// - returns: `true` if the element is a group or a folder reference. Likely an SPM package.
var isGroupOrFolder: Bool {
self is PBXGroup || (self as? PBXFileReference)?.lastKnownFileType == "folder"
}
public func getSortOrder(groupSortPosition: SpecOptions.GroupSortPosition) -> Int {
if type(of: self).isa == "PBXGroup" {