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

Merge pull request #341 from rohitpal440/master

Browse Source 
Set higher version .xcdatamodeld file as current
This commit is contained in:
Yonas Kolb 2018-07-18 21:21:56 +10:00 committed by GitHub
commit f7b8c183ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/XcodeGenKit/PBXProjGenerator.swift
View File

@ -288,7 +288,7 @@ public class PBXProjGenerator {
}
.sorted { child1, child2 in
if child1.object.sortOrder == child2.object.sortOrder {
return child1.object.nameOrPath < child2.object.nameOrPath
return child1.object.nameOrPath.localizedStandardCompare(child2.object.nameOrPath) == .orderedAscending
} else {
return child1.object.sortOrder < child2.object.sortOrder
}

4
Sources/XcodeGenKit/SourceGenerator.swift
View File

@ -119,7 +119,7 @@ class SourceGenerator {
let models = (try? path.children()) ?? []
let modelFileReference = models
.filter { $0.extension == "xcdatamodel" }
.sorted()
.sorted { $0.string.localizedStandardCompare($1.string) == .orderedAscending }
.map { path in
createObject(
id: path.byRemovingBase(path: project.basePath).string,
@ -131,7 +131,7 @@ class SourceGenerator {
)
}
let versionGroup = addObject(id: fileReferencePath.string, XCVersionGroup(
currentVersion: modelFileReference.first?.reference,
currentVersion: modelFileReference.last?.reference,
path: fileReferencePath.string,
sourceTree: sourceTree,
versionGroupType: "wrapper.xcdatamodel",