From b0fa7a2845213aeeaa4caf07ad30eb060bfdf00c Mon Sep 17 00:00:00 2001 From: Rohit Pal Date: Sun, 15 Jul 2018 19:52:09 +0530 Subject: [PATCH 1/3] Sort .xcdatamodeld files in decreasing order To set higher version core data model as current --- Sources/XcodeGenKit/SourceGenerator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift index 6bddb3e0..84460b37 100644 --- a/Sources/XcodeGenKit/SourceGenerator.swift +++ b/Sources/XcodeGenKit/SourceGenerator.swift @@ -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) == .orderedDescending } .map { path in createObject( id: path.byRemovingBase(path: project.basePath).string, From 4d964c07861cd524801b85d4edf611c77e1d2c3b Mon Sep 17 00:00:00 2001 From: Rohit Pal Date: Tue, 17 Jul 2018 17:55:37 +0530 Subject: [PATCH 2/3] Use localizedStandardCompare to sort group --- Sources/XcodeGenKit/PBXProjGenerator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index ee89c525..16002fe1 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -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 } From 4c8742eca638b2745fae64aca60348dbe8e4c6f8 Mon Sep 17 00:00:00 2001 From: Rohit Pal Date: Wed, 18 Jul 2018 16:32:55 +0530 Subject: [PATCH 3/3] Use orderedAscending for comparison in sort method --- Sources/XcodeGenKit/SourceGenerator.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift index 84460b37..5ded8d71 100644 --- a/Sources/XcodeGenKit/SourceGenerator.swift +++ b/Sources/XcodeGenKit/SourceGenerator.swift @@ -119,7 +119,7 @@ class SourceGenerator { let models = (try? path.children()) ?? [] let modelFileReference = models .filter { $0.extension == "xcdatamodel" } - .sorted { $0.string.localizedStandardCompare($1.string) == .orderedDescending } + .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",