Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XCConfig files #64

Merged
merged 11 commits into from
Sep 24, 2017
+252 −696
Merged

XCConfig files #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3abaf7a
include xcconfig files in fixture
yonaskolb Sep 23, 2017
eb5738d
fix target xcconfig files not working
yonaskolb Sep 23, 2017
8e3966a
add groups to spec for specifying non build files
yonaskolb Sep 23, 2017
67ad669
add project xcconfig files
yonaskolb Sep 23, 2017
c34136b
add documentation for project configFiles and groups
yonaskolb Sep 23, 2017
8929625
remove old project
yonaskolb Sep 24, 2017
71e5b4a
include project settings when checking for INFOPLIST_FILE
yonaskolb Sep 24, 2017
2d1ccb6
rename project.groups to project.fileGroups
yonaskolb Sep 24, 2017
8a993fd
move spec validation into seperate file
yonaskolb Sep 24, 2017
1323117
add validation for project fileGroups and configFiles
yonaskolb Sep 24, 2017
4877edf
fix spelling mistakes
yonaskolb Sep 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Fixtures/TestProject/Configs/base.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BASE_SETTING = baseSetting
OVERWRITTEN_SETTING = base
4 changes: 4 additions & 0 deletions Fixtures/TestProject/Configs/config.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "base.xcconfig"

CONFIG_SETTING = configSetting
OVERWRITTEN_SETTING = new
14 changes: 14 additions & 0 deletions Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
Expand Down
15 changes: 15 additions & 0 deletions Fixtures/TestProject/TestProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>"; };
Expand Down Expand Up @@ -102,9 +104,20 @@
path = TestProjectTests;
sourceTree = "<group>";
};
CC9392641F76EDE600C1934A /* Configs */ = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you create this TestProject.xcodeproj/project.pbxproj ?
On Xcode, Configs group is missing reference (appears red).

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The TestProject.xcodeproj was created and edited in Xcode. GeneratedProject.xcodeproj is the one generated by XcodeGen.

I'm not sure what you mean by missing configs group. Both projects appear fine for me

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just saw what you mean by the red group, I've fixed this in master. This project isn't really used in any tests and is more just for a comparison between a project created in xcode versus created in XcodeGen

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 */,
Expand Down Expand Up @@ -509,6 +522,7 @@
};
CCA4B61D1F1FC00500DF34A1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CC9392661F76EDF800C1934A /* config.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down Expand Up @@ -592,6 +606,7 @@
CC2A0EC71F33D50E00C324B9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
CCA4B6051F1FC00500DF34A1 /* Build configuration list for PBXProject "TestProject" */ = {
isa = XCConfigurationList;
Expand Down
Loading