Merge pull request #64 from yonaskolb/xcconfig

XCConfig files
yonaskolb · Sep 24, 2017 · 8343593 · 8343593
2 parents 39c8af3 + 4877edf
commit 8343593
Show file tree

Hide file tree

Showing 13 changed files with 252 additions and 696 deletions.
diff --git a/Fixtures/TestProject/Configs/base.xcconfig b/Fixtures/TestProject/Configs/base.xcconfig
@@ -0,0 +1,2 @@
+BASE_SETTING = baseSetting
+OVERWRITTEN_SETTING = base
diff --git a/Fixtures/TestProject/Configs/config.xcconfig b/Fixtures/TestProject/Configs/config.xcconfig
@@ -0,0 +1,4 @@
+#include "base.xcconfig"
+
+CONFIG_SETTING = configSetting
+OVERWRITTEN_SETTING = new
diff --git a/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj b/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
@@ -58,10 +58,12 @@
 		FR1345298503 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		FR2653659501 /* TestProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = xctest; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = TestProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		FR2993497801 /* MyFramework.framework */ = {isa = PBXFileReference; explicitFileType = framework; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = MyFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		FR3546283901 /* base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = "<group>"; };
 		FR3676338401 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		FR3676338402 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		FR5980633301 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		FR6218091901 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		FR6334256101 /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.xcconfig; sourceTree = "<group>"; };
 		FR6523263101 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = app; includeInIndex = 0; lastKnownFileType = wrapper.application; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FR6877173101 /* TestProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProjectTests.swift; sourceTree = "<group>"; };
 		FR7078510801 /* FrameworkFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkFile.swift; sourceTree = "<group>"; };
@@ -104,9 +106,20 @@
 			path = TestProject;
 			sourceTree = "<group>";
 		};
+		G83406189501 /* Configs */ = {
+			isa = PBXGroup;
+			children = (
+				FR3546283901 /* base.xcconfig */,
+				FR6334256101 /* config.xcconfig */,
+			);
+			name = Configs;
+			path = Configs;
+			sourceTree = "<group>";
+		};
 		G84487712001 = {
 			isa = PBXGroup;
 			children = (
+				G83406189501 /* Configs */,
 				G29934978701 /* MyFramework */,
 				G65232631501 /* TestProject */,
 				G26536595301 /* TestProjectTests */,
@@ -386,6 +399,7 @@
 		};
 		XCBC37128501 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FR6334256101 /* config.xcconfig */;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

diff --git a/Fixtures/TestProject/TestProject.xcodeproj/project.pbxproj b/Fixtures/TestProject/TestProject.xcodeproj/project.pbxproj
@@ -54,6 +54,8 @@
 		CC2A0EBF1F33D50E00C324B9 /* TestProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC2A0EC11F33D50E00C324B9 /* TestProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProjectTests.swift; sourceTree = "<group>"; };
 		CC2A0EC31F33D50E00C324B9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CC9392651F76EDF800C1934A /* base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = base.xcconfig; path = Configs/base.xcconfig; sourceTree = SOURCE_ROOT; };
+		CC9392661F76EDF800C1934A /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = config.xcconfig; path = Configs/config.xcconfig; sourceTree = SOURCE_ROOT; };
 		CCA4B60A1F1FC00500DF34A1 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CCA4B60D1F1FC00500DF34A1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		CCA4B60F1F1FC00500DF34A1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -102,9 +104,20 @@
 			path = TestProjectTests;
 			sourceTree = "<group>";
 		};
+		CC9392641F76EDE600C1934A /* Configs */ = {
+			isa = PBXGroup;
+			children = (
+				CC9392651F76EDF800C1934A /* base.xcconfig */,
+				CC9392661F76EDF800C1934A /* config.xcconfig */,
+			);
+			name = Configs;
+			path = "New Group";
+			sourceTree = "<group>";
+		};
 		CCA4B6011F1FC00500DF34A1 = {
 			isa = PBXGroup;
 			children = (
+				CC9392641F76EDE600C1934A /* Configs */,
 				CCA4B60C1F1FC00500DF34A1 /* TestProject */,
 				CCA71FE91F225E4C00F772C1 /* MyFramework */,
 				CC2A0EC01F33D50E00C324B9 /* TestProjectTests */,
@@ -509,6 +522,7 @@
 		};
 		CCA4B61D1F1FC00500DF34A1 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = CC9392661F76EDF800C1934A /* config.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -592,6 +606,7 @@
 				CC2A0EC71F33D50E00C324B9 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		CCA4B6051F1FC00500DF34A1 /* Build configuration list for PBXProject "TestProject" */ = {
 			isa = XCConfigurationList;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BASE_SETTING = baseSetting
		OVERWRITTEN_SETTING = base