diff --git a/.gitmodules b/.gitmodules index c919b78..cae032a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..0318615 --- /dev/null +++ b/Cartfile @@ -0,0 +1 @@ +github "ReactKit/SwiftState" ~> 1.1.0 \ No newline at end of file diff --git a/Cartfile.lock b/Cartfile.lock new file mode 100644 index 0000000..747c46c --- /dev/null +++ b/Cartfile.lock @@ -0,0 +1 @@ +github "ReactKit/SwiftState" "1.1.0" diff --git a/Carthage.checkout/SwiftState b/Carthage.checkout/SwiftState new file mode 160000 index 0000000..740a2a7 --- /dev/null +++ b/Carthage.checkout/SwiftState @@ -0,0 +1 @@ +Subproject commit 740a2a74011a1c2698579c2d543e2a1f38051164 diff --git a/SwiftTask.xcodeproj/project.pbxproj b/SwiftTask.xcodeproj/project.pbxproj index 1fe40da..6d1cadd 100644 --- a/SwiftTask.xcodeproj/project.pbxproj +++ b/SwiftTask.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* 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 */; }; @@ -17,7 +16,6 @@ 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 */; }; @@ -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 */ @@ -77,10 +77,10 @@ 1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = ""; }; 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = ""; }; 1FA4631719A8D70A00DD8729 /* Alamofire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = ""; }; - 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = ""; }; 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 = ""; }; 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = ""; }; + 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = ""; }; 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -89,7 +89,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 48797D6719B42CF30085D80F /* SwiftState.framework in Frameworks */, + 48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -97,7 +97,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */, + 48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */, + 48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -113,7 +113,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */, + 48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -131,6 +131,7 @@ 1F46DECA199EDF1000F97868 = { isa = PBXGroup; children = ( + 48A1E7EA1A366F52007619EB /* Carthage.checkout */, 1FA4631219A8D70A00DD8729 /* Vendor */, 1F46DED6199EDF1000F97868 /* SwiftTask */, 1F46DEE0199EDF1000F97868 /* SwiftTaskTests */, @@ -192,7 +193,6 @@ 1FA4631219A8D70A00DD8729 /* Vendor */ = { isa = PBXGroup; children = ( - 1FA4631E19A8D70A00DD8729 /* SwiftState */, 1FA4631319A8D70A00DD8729 /* Alamofire */, 1F0E282119C1DEA0005EF467 /* Async */, ); @@ -215,21 +215,29 @@ path = Source; sourceTree = ""; }; - 1FA4631E19A8D70A00DD8729 /* SwiftState */ = { + 48A1E7EA1A366F52007619EB /* Carthage.checkout */ = { isa = PBXGroup; children = ( - 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */, + 48A1E7EB1A366F52007619EB /* SwiftState */, + ); + path = Carthage.checkout; + sourceTree = ""; + }; + 48A1E7EB1A366F52007619EB /* SwiftState */ = { + isa = PBXGroup; + children = ( + 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */, ); path = SwiftState; sourceTree = ""; }; - 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 = ""; @@ -362,8 +370,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 1FA4633119A8D70A00DD8729 /* Products */; - ProjectRef = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */; + ProductGroup = 48A1E8041A366F52007619EB /* Products */; + ProjectRef = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */; }, ); projectRoot = ""; @@ -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 */ diff --git a/Vendor/SwiftState b/Vendor/SwiftState deleted file mode 160000 index 1da90cf..0000000 --- a/Vendor/SwiftState +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1da90cf46541c609d20723e29a3e441daeba698b