Merge pull request #791 from bryansum/revert-694

Revert "Add Base to known regions even if one doesn't exist"
This commit is contained in:
Yonas Kolb
2020-02-27 14:00:43 +11:00
committed by GitHub
6 changed files with 5 additions and 7 deletions
+1
View File
@@ -3,6 +3,7 @@
## Next Version
#### Fixed
- Revert "Add Base to known regions even if one doesn't exist" [#791](https://github.com/yonaskolb/XcodeGen/pull/792) @bryansum
- Set `defaultConfigurationName` for every target which is defined in a project. [#787](https://github.com/yonaskolb/XcodeGen/pull/787)
- Set `TEST_TARGET_NAME` only when a project has UITest bundle. [#792](https://github.com/yonaskolb/XcodeGen/pull/792) @ken0nek
+4 -3
View File
@@ -288,9 +288,10 @@ public class PBXProjGenerator {
if !assetTags.isEmpty {
projectAttributes["knownAssetTags"] = assetTags
}
let knownRegions = sourceGenerator.knownRegions
pbxProject.knownRegions = (knownRegions.isEmpty ? ["en"] : knownRegions).union(["Base"]).sorted()
let knownRegions = sourceGenerator.knownRegions.sorted()
pbxProject.knownRegions = knownRegions.isEmpty ? ["en"] : knownRegions
pbxProject.packages = packageReferences.sorted { $0.key < $1.key }.map { $1 }
let allTargets: [PBXTarget] = targetObjects.valueArray + targetAggregateObjects.valueArray
@@ -321,7 +321,6 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Base,
en,
);
mainGroup = 293D0FF827366B513839236A;
@@ -154,7 +154,6 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Base,
en,
);
mainGroup = 218F6C96DF9E182F526258CF;
@@ -87,7 +87,6 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Base,
en,
);
mainGroup = 4E8CFA4275C972686621210C;
@@ -59,7 +59,6 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Base,
en,
);
mainGroup = 2D08B11F4EE060D112B7BCA1;