Skip to content

Commit b5fa41f

Browse files
agentkagentk
committed
Merge branch 'release/0.1.1'
2 parents 01b8a48 + d044864 commit b5fa41f

File tree

10 files changed

+63
-63
lines changed

10 files changed

+63
-63
lines changed

‎.gitignore

+39-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Xcode
22
#
3+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4+
5+
## Build generated
36
build/
7+
DerivedData
8+
9+
## Various settings
410
*.pbxuser
511
!default.pbxuser
612
*.mode1v3
@@ -10,11 +16,41 @@ build/
1016
*.perspectivev3
1117
!default.perspectivev3
1218
xcuserdata
19+
20+
## Other
1321
*.xccheckout
1422
*.moved-aside
15-
DerivedData
23+
*.xcuserstate
24+
*.xcscmblueprint
25+
26+
## Obj-C/Swift specific
1627
*.hmap
1728
*.ipa
18-
*.xcuserstate
19-
Carthage/
29+
30+
# Swift Package Manager
31+
32+
Packages/
33+
.build/
34+
35+
# CocoaPods
36+
37+
Pods/
38+
39+
# Carthage
40+
41+
Carthage/Checkouts
42+
Carthage/Build
43+
44+
# fastlane
45+
#
46+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
47+
# screenshots whenever they are needed.
48+
# For more information about the recommended setup visit:
49+
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
50+
51+
fastlane/report.xml
52+
fastlane/screenshots
53+
54+
# OS X
55+
2056
.DS_Store

‎Cartfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
github "ReactiveX/RxSwift" ~> 2.0
21
github "ReduxKit/ReduxKit" ~> 0.1

‎Cartfile.resolved

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "Quick/Nimble" "v3.0.0"
22
github "Quick/Quick" "v0.8.0"
33
github "ReduxKit/ReduxKit" "0.1.3"
4-
github "ReactiveX/RxSwift" "2.0.0-beta.4"

‎ReduxKitRouter.podspec

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Pod::Spec.new do |spec|
2+
spec.name = 'ReduxKitRouter'
3+
spec.version = '0.1.1'
4+
spec.summary = 'Router middleware for ReduxKit'
5+
spec.homepage = 'https://github.com/ReduxKit/ReduxKitRouter'
6+
spec.license = { :type => 'MIT', :file => 'LICENSE' }
7+
spec.authors = { 'Aleksander Herforth Rendtslev' => '[email protected]', 'Karl Bowden' => '[email protected]' }
8+
spec.source = { :git => 'https://github.com/ReduxKit/ReduxKitRouter.git', :tag => spec.version.to_s }
9+
spec.source_files = 'ReduxKitRouter'
10+
spec.dependency 'ReduxKit', '~> 0.1'
11+
spec.ios.deployment_target = '8.0'
12+
end

‎ReduxKitRouter.xcodeproj/project.pbxproj

+10-24
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
BC92D31B1C089A1000AA5103 /* RouteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC92D31A1C089A1000AA5103 /* RouteViewController.swift */; };
1616
BCA317601C03621C00C614A2 /* ReduxKitRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA3175F1C03621C00C614A2 /* ReduxKitRouter.h */; settings = {ATTRIBUTES = (Public, ); }; };
1717
BCA317671C03621C00C614A2 /* ReduxKitRouter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA3175C1C03621C00C614A2 /* ReduxKitRouter.framework */; };
18-
BCA317771C038D9F00C614A2 /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = BCA317761C038D9F00C614A2 /* Cartfile */; };
1918
BCA317791C0392E500C614A2 /* RouteActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCA317781C0392E500C614A2 /* RouteActions.swift */; };
2019
BCA3177C1C0395DC00C614A2 /* ReduxKitRouterMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCA3177B1C0395DC00C614A2 /* ReduxKitRouterMiddleware.swift */; };
21-
BCA317841C03960300C614A2 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA317801C03960300C614A2 /* RxSwift.framework */; };
2220
BCA317851C03960300C614A2 /* ReduxKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA317811C03960300C614A2 /* ReduxKit.framework */; };
23-
BCA317881C03961A00C614A2 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA317801C03960300C614A2 /* RxSwift.framework */; };
2421
BCA317891C03961A00C614A2 /* ReduxKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA317811C03960300C614A2 /* ReduxKit.framework */; };
2522
BCA3178C1C03961A00C614A2 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA3178A1C03961A00C614A2 /* Nimble.framework */; };
2623
BCA3178D1C03961A00C614A2 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA3178B1C03961A00C614A2 /* Quick.framework */; };
@@ -42,9 +39,11 @@
4239
/* End PBXContainerItemProxy section */
4340

4441
/* Begin PBXFileReference section */
42+
73061FA61C2BA0B6005FA55E /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
43+
73061FA71C2BA0B6005FA55E /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
44+
73061FA81C2BA0B6005FA55E /* Cartfile.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.resolved; sourceTree = "<group>"; };
45+
73061FA91C2BA0BD005FA55E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
4546
737290551C2AC92E0003AC6B /* RoutableState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoutableState.swift; sourceTree = "<group>"; };
46-
73D6BBBF1C2A878C00FAA686 /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
47-
73D6BBC01C2A878C00FAA686 /* Cartfile.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.resolved; sourceTree = "<group>"; };
4847
BC231BCC1C0DA9C00091E626 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
4948
BC56725C1C07153300D43CE4 /* RouterState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouterState.swift; sourceTree = "<group>"; };
5049
BC56725E1C07191B00D43CE4 /* RouterReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouterReducer.swift; sourceTree = "<group>"; };
@@ -55,10 +54,8 @@
5554
BCA317611C03621C00C614A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5655
BCA317661C03621C00C614A2 /* ReduxKitRouter-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReduxKitRouter-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5756
BCA3176D1C03621C00C614A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
58-
BCA317761C038D9F00C614A2 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cartfile; path = ../ReduxKitBond/Cartfile; sourceTree = "<group>"; };
5957
BCA317781C0392E500C614A2 /* RouteActions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteActions.swift; sourceTree = "<group>"; };
6058
BCA3177B1C0395DC00C614A2 /* ReduxKitRouterMiddleware.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReduxKitRouterMiddleware.swift; sourceTree = "<group>"; };
61-
BCA317801C03960300C614A2 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
6259
BCA317811C03960300C614A2 /* ReduxKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReduxKit.framework; path = Carthage/Build/iOS/ReduxKit.framework; sourceTree = "<group>"; };
6360
BCA3178A1C03961A00C614A2 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
6461
BCA3178B1C03961A00C614A2 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = "<group>"; };
@@ -75,7 +72,6 @@
7572
buildActionMask = 2147483647;
7673
files = (
7774
BC231BCD1C0DA9C00091E626 /* UIKit.framework in Frameworks */,
78-
BCA317841C03960300C614A2 /* RxSwift.framework in Frameworks */,
7975
BCA317851C03960300C614A2 /* ReduxKit.framework in Frameworks */,
8076
);
8177
runOnlyForDeploymentPostprocessing = 0;
@@ -86,7 +82,6 @@
8682
files = (
8783
BCA3178C1C03961A00C614A2 /* Nimble.framework in Frameworks */,
8884
BCA3178D1C03961A00C614A2 /* Quick.framework in Frameworks */,
89-
BCA317881C03961A00C614A2 /* RxSwift.framework in Frameworks */,
9085
BCA317891C03961A00C614A2 /* ReduxKit.framework in Frameworks */,
9186
BCA317671C03621C00C614A2 /* ReduxKitRouter.framework in Frameworks */,
9287
);
@@ -101,7 +96,6 @@
10196
BC231BCC1C0DA9C00091E626 /* UIKit.framework */,
10297
BCA3178A1C03961A00C614A2 /* Nimble.framework */,
10398
BCA3178B1C03961A00C614A2 /* Quick.framework */,
104-
BCA317801C03960300C614A2 /* RxSwift.framework */,
10599
BCA317811C03960300C614A2 /* ReduxKit.framework */,
106100
);
107101
name = "Dependencies iOS";
@@ -110,9 +104,10 @@
110104
BCA317521C03621C00C614A2 = {
111105
isa = PBXGroup;
112106
children = (
113-
BCA317761C038D9F00C614A2 /* Cartfile */,
114-
73D6BBBF1C2A878C00FAA686 /* Cartfile.private */,
115-
73D6BBC01C2A878C00FAA686 /* Cartfile.resolved */,
107+
73061FA91C2BA0BD005FA55E /* README.md */,
108+
73061FA61C2BA0B6005FA55E /* Cartfile */,
109+
73061FA71C2BA0B6005FA55E /* Cartfile.private */,
110+
73061FA81C2BA0B6005FA55E /* Cartfile.resolved */,
116111
BCA3175E1C03621C00C614A2 /* ReduxKitRouter */,
117112
BCA3176A1C03621C00C614A2 /* ReduxKitRouterTests */,
118113
73D6BBC11C2A87A300FAA686 /* Dependencies iOS */,
@@ -251,7 +246,6 @@
251246
isa = PBXResourcesBuildPhase;
252247
buildActionMask = 2147483647;
253248
files = (
254-
BCA317771C038D9F00C614A2 /* Cartfile in Resources */,
255249
);
256250
runOnlyForDeploymentPostprocessing = 0;
257251
};
@@ -271,9 +265,6 @@
271265
files = (
272266
);
273267
inputPaths = (
274-
"$(SRCROOT)/Carthage/Build/iOS/RxBlocking.framework",
275-
"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
276-
"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
277268
"$(SRCROOT)/Carthage/Build/iOS/ReduxKit.framework",
278269
);
279270
name = "Run Script";
@@ -289,9 +280,6 @@
289280
files = (
290281
);
291282
inputPaths = (
292-
"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
293-
"$(SRCROOT)/Carthage/Build/iOS/RxBlocking.framework",
294-
"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
295283
"$(SRCROOT)/Carthage/Build/iOS/ReduxKit.framework",
296284
"$(SRCROOT)/Carthage/Build/iOS/Nimble.framework",
297285
"$(SRCROOT)/Carthage/Build/iOS/Quick.framework",
@@ -385,6 +373,7 @@
385373
ONLY_ACTIVE_ARCH = YES;
386374
PRODUCT_BUNDLE_IDENTIFIER = ReduxKit.ReduxKitRouter;
387375
PRODUCT_NAME = ReduxKitRouter;
376+
SDKROOT = iphoneos;
388377
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
389378
TARGETED_DEVICE_FAMILY = "1,2";
390379
VERSIONING_SYSTEM = "apple-generic";
@@ -428,6 +417,7 @@
428417
MTL_ENABLE_DEBUG_INFO = NO;
429418
PRODUCT_BUNDLE_IDENTIFIER = ReduxKit.ReduxKitRouter;
430419
PRODUCT_NAME = ReduxKitRouter;
420+
SDKROOT = iphoneos;
431421
TARGETED_DEVICE_FAMILY = "1,2";
432422
VALIDATE_PRODUCT = YES;
433423
VERSIONING_SYSTEM = "apple-generic";
@@ -449,7 +439,6 @@
449439
);
450440
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
451441
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
452-
SDKROOT = iphoneos;
453442
SKIP_INSTALL = YES;
454443
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
455444
};
@@ -469,7 +458,6 @@
469458
);
470459
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
471460
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
472-
SDKROOT = iphoneos;
473461
SKIP_INSTALL = YES;
474462
};
475463
name = Release;
@@ -485,7 +473,6 @@
485473
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
486474
PRODUCT_BUNDLE_IDENTIFIER = ReduxKit.ReduxKitRouterTests;
487475
PRODUCT_NAME = "$(TARGET_NAME)";
488-
SDKROOT = iphoneos;
489476
};
490477
name = Debug;
491478
};
@@ -500,7 +487,6 @@
500487
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
501488
PRODUCT_BUNDLE_IDENTIFIER = ReduxKit.ReduxKitRouterTests;
502489
PRODUCT_NAME = "$(TARGET_NAME)";
503-
SDKROOT = iphoneos;
504490
};
505491
name = Release;
506492
};

‎ReduxKitRouter.xcodeproj/project.xcworkspace/xcshareddata/ReduxKitRouter.xcscmblueprint

-30
This file was deleted.

‎ReduxKitRouter/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>0.1.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎ReduxKitRouterTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>0.1.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎ReduxKitRouterTests/ReduxKitRouterMiddlewareSpec.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import Quick
1111
import Nimble
12-
import RxSwift
1312
import ReduxKit
1413
@testable import ReduxKitRouter
1514

‎ReduxKitRouterTests/RouteSpec.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import Quick
1111
import Nimble
12-
import RxSwift
1312
import ReduxKit
1413
@testable import ReduxKitRouter
1514

0 commit comments

Comments
 (0)