Skip to content

Add Carthage 0.3 support. #11

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

Add Carthage 0.3 support. #11

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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "Vendor/SwiftState"]
path = Vendor/SwiftState
url = https://github.com/ReactKit/SwiftState.git
[submodule "Vendor/Alamofire"]
path = Vendor/Alamofire
url = https://github.com/Alamofire/Alamofire.git
[submodule "Vendor/Async"]
path = Vendor/Async
url = https://github.com/duemunk/Async.git
[submodule "Carthage.checkout/SwiftState"]
path = Carthage.checkout/SwiftState
url = https://github.com/ReactKit/SwiftState.git
1 change: 1 addition & 0 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "ReactKit/SwiftState" ~> 1.1.0
1 change: 1 addition & 0 deletions Cartfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "ReactKit/SwiftState" "1.1.0"
1 change: 1 addition & 0 deletions Carthage.checkout/SwiftState
Open in desktop
Submodule SwiftState added at 740a2a
98 changes: 53 additions & 45 deletions SwiftTask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@
/* Begin PBXBuildFile section */
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
1F2C0C1C1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1F2C0C1D1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1F2C0C1E1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
1F2C0C1F1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
1F46DEDA199EDF1000F97868 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
Expand All @@ -27,40 +25,42 @@
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 */; };
48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA4634319A8D70A00DD8729 /* SwiftState.framework */; };
48797D6719B42CF30085D80F /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA4634319A8D70A00DD8729 /* SwiftState.framework */; };
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 */; };
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 */
1FA4634219A8D70A00DD8729 /* PBXContainerItemProxy */ = {
48A1E8181A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1FA620001996601000460108;
remoteInfo = SwiftState;
remoteInfo = "SwiftState-OSX";
};
1FA4634419A8D70A00DD8729 /* PBXContainerItemProxy */ = {
48A1E81A1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1FA6200B1996601000460108;
remoteInfo = SwiftStateTests;
remoteInfo = "SwiftState-OSXTests";
};
4822F0BF19D00A7800F5F572 /* PBXContainerItemProxy */ = {
48A1E81C1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
remoteInfo = "SwiftState-iOSTests";
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
remoteInfo = "SwiftState-iOS";
};
4872D5C719B423D600F326B5 /* PBXContainerItemProxy */ = {
48A1E81E1A366F52007619EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
remoteInfo = "SwiftState-iOS";
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
remoteInfo = "SwiftState-iOSTests";
};
/* End PBXContainerItemProxy section */

Expand All @@ -77,10 +77,10 @@
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
1FA4631719A8D70A00DD8729 /* Alamofire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = "<group>"; };
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>"; };
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -89,31 +89,31 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48797D6719B42CF30085D80F /* SwiftState.framework in Frameworks */,
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1F46DEDC199EDF1000F97868 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */,
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4822F0CD19D00ABF00F5F572 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */,
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
48CD5A0819AEE3570042B9F1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */,
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -131,6 +131,7 @@
1F46DECA199EDF1000F97868 = {
isa = PBXGroup;
children = (
48A1E7EA1A366F52007619EB /* Carthage.checkout */,
1FA4631219A8D70A00DD8729 /* Vendor */,
1F46DED6199EDF1000F97868 /* SwiftTask */,
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
Expand Down Expand Up @@ -192,7 +193,6 @@
1FA4631219A8D70A00DD8729 /* Vendor */ = {
isa = PBXGroup;
children = (
1FA4631E19A8D70A00DD8729 /* SwiftState */,
1FA4631319A8D70A00DD8729 /* Alamofire */,
1F0E282119C1DEA0005EF467 /* Async */,
);
Expand All @@ -215,21 +215,29 @@
path = Source;
sourceTree = "<group>";
};
1FA4631E19A8D70A00DD8729 /* SwiftState */ = {
48A1E7EA1A366F52007619EB /* Carthage.checkout */ = {
isa = PBXGroup;
children = (
1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */,
48A1E7EB1A366F52007619EB /* SwiftState */,
);
path = Carthage.checkout;
sourceTree = "<group>";
};
48A1E7EB1A366F52007619EB /* SwiftState */ = {
isa = PBXGroup;
children = (
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */,
);
path = SwiftState;
sourceTree = "<group>";
};
1FA4633119A8D70A00DD8729 /* Products */ = {
48A1E8041A366F52007619EB /* Products */ = {
isa = PBXGroup;
children = (
1FA4634319A8D70A00DD8729 /* SwiftState.framework */,
1FA4634519A8D70A00DD8729 /* SwiftState-OSXTests.xctest */,
4872D5C819B423D600F326B5 /* SwiftState.framework */,
4822F0C019D00A7800F5F572 /* SwiftStateTests-iOS.xctest */,
48A1E8191A366F52007619EB /* SwiftState.framework */,
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */,
48A1E81D1A366F52007619EB /* SwiftState.framework */,
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -362,8 +370,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 1FA4633119A8D70A00DD8729 /* Products */;
ProjectRef = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
ProductGroup = 48A1E8041A366F52007619EB /* Products */;
ProjectRef = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
},
);
projectRoot = "";
Expand All @@ -377,32 +385,32 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
1FA4634319A8D70A00DD8729 /* SwiftState.framework */ = {
48A1E8191A366F52007619EB /* SwiftState.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftState.framework;
remoteRef = 1FA4634219A8D70A00DD8729 /* PBXContainerItemProxy */;
remoteRef = 48A1E8181A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1FA4634519A8D70A00DD8729 /* SwiftState-OSXTests.xctest */ = {
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftState-OSXTests.xctest";
remoteRef = 1FA4634419A8D70A00DD8729 /* PBXContainerItemProxy */;
remoteRef = 48A1E81A1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4822F0C019D00A7800F5F572 /* SwiftStateTests-iOS.xctest */ = {
48A1E81D1A366F52007619EB /* SwiftState.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftStateTests-iOS.xctest";
remoteRef = 4822F0BF19D00A7800F5F572 /* PBXContainerItemProxy */;
fileType = wrapper.framework;
path = SwiftState.framework;
remoteRef = 48A1E81C1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4872D5C819B423D600F326B5 /* SwiftState.framework */ = {
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftState.framework;
remoteRef = 4872D5C719B423D600F326B5 /* PBXContainerItemProxy */;
fileType = wrapper.cfbundle;
path = "SwiftStateTests-iOS.xctest";
remoteRef = 48A1E81E1A366F52007619EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down
1 change: 0 additions & 1 deletion Vendor/SwiftState
Open in desktop
Submodule SwiftState deleted from 1da90c