Skip to content

Commit a4b7926

Browse files
committed
Merge pull request #22 from ReactKit/refactor/remove-SwiftState
Remove SwiftState dependency for significant performance improvement.
2 parents b83ce3e + 1d02eb1 commit a4b7926

File tree

9 files changed

+272
-346
lines changed

9 files changed

+272
-346
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "Carthage/Checkouts/SwiftState"]
2-
path = Carthage/Checkouts/SwiftState
3-
url = https://github.com/ReactKit/SwiftState.git
41
[submodule "Carthage/Checkouts/Alamofire"]
52
path = Carthage/Checkouts/Alamofire
63
url = https://github.com/Alamofire/Alamofire.git

Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
github "Alamofire/Alamofire" "2dd2f6f6186b98f27b75479b15c109ebd4dd8b52"
22
github "duemunk/Async" "32cec7ee89d6f1a39b10f2f69d91640ba3416eca"
3-
github "ReactKit/SwiftState" "1.1.1"

Carthage/Checkouts/SwiftState

Lines changed: 0 additions & 1 deletion
This file was deleted.

SwiftTask.podspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
Pod::Spec.new do |s|
22
s.name = 'SwiftTask'
3-
s.version = '2.5.1'
3+
s.version = '2.6.0'
44
s.license = { :type => 'MIT' }
55
s.homepage = 'https://github.com/ReactKit/SwiftTask'
66
s.authors = { 'Yasuhiro Inami' => '[email protected]' }
77
s.summary = 'Promise + progress + pause + cancel + retry, using SwiftState (state machine).'
88
s.source = { :git => 'https://github.com/inamiy/SwiftTask.git', :tag => "#{s.version}" }
99
s.source_files = 'SwiftTask/**/*.{h,swift}'
1010
s.requires_arc = true
11-
12-
s.dependency 'SwiftState', '~> 1.1.1'
1311
end

SwiftTask.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
484552331A4CF37F007770CA /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551CE1A4CF37F007770CA /* Alamofire.swift */; };
2525
4845524A1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
2626
4845524B1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
27-
484552CA1A4CF48A007770CA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 484552C91A4CF48A007770CA /* SwiftState.framework */; };
28-
484552CB1A4CF48D007770CA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 484552C91A4CF48A007770CA /* SwiftState.framework */; };
2927
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
3028
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
3129
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
3230
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
3331
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
32+
48B58D7B1A6F255E0068E18C /* _StateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B58D7A1A6F255E0068E18C /* _StateMachine.swift */; };
33+
48B58D7C1A6F255E0068E18C /* _StateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B58D7A1A6F255E0068E18C /* _StateMachine.swift */; };
3434
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
3535
48CD5A4619AEEC2E0042B9F1 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
3636
/* End PBXBuildFile section */
@@ -50,9 +50,9 @@
5050
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5151
484551CE1A4CF37F007770CA /* Alamofire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
5252
484551DC1A4CF37F007770CA /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
53-
484552C91A4CF48A007770CA /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftState.framework; path = Carthage/Checkouts/SwiftState/build/Debug/SwiftState.framework; sourceTree = "<group>"; };
5453
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
5554
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
55+
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _StateMachine.swift; sourceTree = "<group>"; };
5656
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5757
/* End PBXFileReference section */
5858

@@ -61,7 +61,6 @@
6161
isa = PBXFrameworksBuildPhase;
6262
buildActionMask = 2147483647;
6363
files = (
64-
484552CA1A4CF48A007770CA /* SwiftState.framework in Frameworks */,
6564
);
6665
runOnlyForDeploymentPostprocessing = 0;
6766
};
@@ -85,7 +84,6 @@
8584
isa = PBXFrameworksBuildPhase;
8685
buildActionMask = 2147483647;
8786
files = (
88-
484552CB1A4CF48D007770CA /* SwiftState.framework in Frameworks */,
8987
);
9088
runOnlyForDeploymentPostprocessing = 0;
9189
};
@@ -95,7 +93,6 @@
9593
1F46DECA199EDF1000F97868 = {
9694
isa = PBXGroup;
9795
children = (
98-
484552C91A4CF48A007770CA /* SwiftState.framework */,
9996
484551B31A4CF37F007770CA /* Checkouts */,
10097
1F46DED6199EDF1000F97868 /* SwiftTask */,
10198
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
@@ -118,6 +115,7 @@
118115
isa = PBXGroup;
119116
children = (
120117
1F46DED9199EDF1000F97868 /* SwiftTask.h */,
118+
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */,
121119
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */,
122120
1F46DED7199EDF1000F97868 /* Supporting Files */,
123121
);
@@ -362,6 +360,7 @@
362360
buildActionMask = 2147483647;
363361
files = (
364362
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */,
363+
48B58D7B1A6F255E0068E18C /* _StateMachine.swift in Sources */,
365364
);
366365
runOnlyForDeploymentPostprocessing = 0;
367366
};
@@ -402,6 +401,7 @@
402401
buildActionMask = 2147483647;
403402
files = (
404403
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */,
404+
48B58D7C1A6F255E0068E18C /* _StateMachine.swift in Sources */,
405405
);
406406
runOnlyForDeploymentPostprocessing = 0;
407407
};

SwiftTask.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)