Skip to content

Fix cf78ad5 by avoiding nested-xcodeproj which cause carthage-build failure. #12

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

Merged
merged 1 commit into from
Dec 9, 2014
Merged

Fix cf78ad5 by avoiding nested-xcodeproj which cause carthage-build failure. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Xcode
build/*
build/
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -8,10 +8,12 @@ build/*
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate

Carthage.build
127 changes: 41 additions & 86 deletions SwiftTask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,45 +25,16 @@
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
48C6AB331A3683410076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB2E1A3682F00076A158 /* SwiftState.framework */; };
48C6AB341A3683480076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB301A3682F00076A158 /* SwiftState.framework */; };
48C6AB351A36839F0076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB301A3682F00076A158 /* SwiftState.framework */; };
48C6AB6A1A3688850076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB2E1A3682F00076A158 /* SwiftState.framework */; };
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
48CD5A4619AEEC2E0042B9F1 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
48A1E8181A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1FA620001996601000460108;
remoteInfo = "SwiftState-OSX";
};
48A1E81A1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1FA6200B1996601000460108;
remoteInfo = "SwiftState-OSXTests";
};
48A1E81C1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
remoteInfo = "SwiftState-iOS";
};
48A1E81E1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
remoteInfo = "SwiftState-iOSTests";
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1F0E282319C1DEA0005EF467 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
1F20250119ADA8FD00DE0495 /* BasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTests.swift; sourceTree = "<group>"; };
Expand All @@ -80,7 +51,8 @@
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = "<group>"; };
48C6AB2E1A3682F00076A158 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
48C6AB301A3682F00076A158 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -89,7 +61,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */,
48C6AB341A3683480076A158 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -98,6 +70,7 @@
buildActionMask = 2147483647;
files = (
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
48C6AB351A36839F0076A158 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -106,14 +79,15 @@
buildActionMask = 2147483647;
files = (
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
48C6AB6A1A3688850076A158 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
48CD5A0819AEE3570042B9F1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */,
48C6AB331A3683410076A158 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -131,7 +105,7 @@
1F46DECA199EDF1000F97868 = {
isa = PBXGroup;
children = (
48A1E7EA1A366F52007619EB /* Carthage.checkout */,
48C6AB2C1A3682F00076A158 /* Carthage.build */,
1FA4631219A8D70A00DD8729 /* Vendor */,
1F46DED6199EDF1000F97868 /* SwiftTask */,
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
Expand Down Expand Up @@ -215,31 +189,29 @@
path = Source;
sourceTree = "<group>";
};
48A1E7EA1A366F52007619EB /* Carthage.checkout */ = {
48C6AB2C1A3682F00076A158 /* Carthage.build */ = {
isa = PBXGroup;
children = (
48A1E7EB1A366F52007619EB /* SwiftState */,
48C6AB2D1A3682F00076A158 /* iOS */,
48C6AB2F1A3682F00076A158 /* Mac */,
);
path = Carthage.checkout;
path = Carthage.build;
sourceTree = "<group>";
};
48A1E7EB1A366F52007619EB /* SwiftState */ = {
48C6AB2D1A3682F00076A158 /* iOS */ = {
isa = PBXGroup;
children = (
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */,
48C6AB2E1A3682F00076A158 /* SwiftState.framework */,
);
path = SwiftState;
path = iOS;
sourceTree = "<group>";
};
48A1E8041A366F52007619EB /* Products */ = {
48C6AB2F1A3682F00076A158 /* Mac */ = {
isa = PBXGroup;
children = (
48A1E8191A366F52007619EB /* SwiftState.framework */,
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */,
48A1E81D1A366F52007619EB /* SwiftState.framework */,
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */,
48C6AB301A3682F00076A158 /* SwiftState.framework */,
);
name = Products;
path = Mac;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -368,12 +340,6 @@
mainGroup = 1F46DECA199EDF1000F97868;
productRefGroup = 1F46DED5199EDF1000F97868 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 48A1E8041A366F52007619EB /* Products */;
ProjectRef = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
},
);
projectRoot = "";
targets = (
1F46DED3199EDF1000F97868 /* SwiftTask-OSX */,
Expand All @@ -384,37 +350,6 @@
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
48A1E8191A366F52007619EB /* SwiftState.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftState.framework;
remoteRef = 48A1E8181A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftState-OSXTests.xctest";
remoteRef = 48A1E81A1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
48A1E81D1A366F52007619EB /* SwiftState.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftState.framework;
remoteRef = 48A1E81C1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftStateTests-iOS.xctest";
remoteRef = 48A1E81E1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
1F46DED2199EDF1000F97868 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down Expand Up @@ -585,6 +520,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = SwiftTask/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -605,6 +544,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = SwiftTask/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -622,6 +565,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/Mac",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -640,6 +584,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/Mac",
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
Expand All @@ -653,6 +598,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/iOS",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -672,6 +618,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/iOS",
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -690,6 +637,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/iOS",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -712,6 +663,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage.build/iOS",
);
INFOPLIST_FILE = SwiftTask/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
7 changes: 7 additions & 0 deletions SwiftTask.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions SwiftTask.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.