From 2d2958f078fba9295a999f74c52e8f455ac00867 Mon Sep 17 00:00:00 2001 From: Igor Tarasenko Date: Fri, 31 Aug 2018 12:58:25 +0200 Subject: [PATCH 1/3] Set knownRegions to en by default. Fix for #389 --- Sources/XcodeGenKit/PBXProjGenerator.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index b0068f0c..58d8f45f 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -228,7 +228,9 @@ public class PBXProjGenerator { .merged(project.attributes) .merged(generateTargetAttributes() ?? [:]) - pbxProject.object.knownRegions = sourceGenerator.knownRegions.sorted() + let knownRegions: [String] = sourceGenerator.knownRegions.sorted() + pbxProject.object.knownRegions = knownRegions.isEmpty ? ["en"] : knownRegions + let allTargets: [ObjectReference] = Array(targetObjects.values) + Array(targetAggregateObjects.values.map { ObjectReference(reference: $0.reference, object: $0.object) }) pbxProject.object.targets = allTargets .sorted { $0.object.name < $1.object.name } From 8c434541ff32bd41e44ed60cc558276d218bc9d2 Mon Sep 17 00:00:00 2001 From: Igor Tarasenko Date: Fri, 31 Aug 2018 14:42:42 +0200 Subject: [PATCH 2/3] Remove explicit type for the knownRegions variable --- 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 58d8f45f..7c455193 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -228,7 +228,7 @@ public class PBXProjGenerator { .merged(project.attributes) .merged(generateTargetAttributes() ?? [:]) - let knownRegions: [String] = sourceGenerator.knownRegions.sorted() + let knownRegions = sourceGenerator.knownRegions.sorted() pbxProject.object.knownRegions = knownRegions.isEmpty ? ["en"] : knownRegions let allTargets: [ObjectReference] = Array(targetObjects.values) + Array(targetAggregateObjects.values.map { ObjectReference(reference: $0.reference, object: $0.object) }) From 82d3c1839f9bf067079ccf5a310b8f297cb889fc Mon Sep 17 00:00:00 2001 From: Igor Tarasenko Date: Fri, 31 Aug 2018 14:47:42 +0200 Subject: [PATCH 3/3] Add entry to the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b7adf2..7d32cf65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Master - Fixed default settings for macOS unit-tests [387](https://github.com/yonaskolb/XcodeGen/pull/387) @frankdilo +- Added default value for knownRegions property [390](https://github.com/yonaskolb/XcodeGen/pull/390) @Saik0s ## 1.11.1