Skip to content

Commit b630267

Browse files
authored
Merge pull request #12 from inamiy/swift-3
Update for Swift 3 & RAS 1.0.0 & RAC 5.0.0
2 parents 1576e79 + befa564 commit b630267

File tree

73 files changed

+1347
-1607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1347
-1607
lines changed

Diff for: .gitmodules

+12
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,15 @@
3737
[submodule "Carthage/Checkouts/Pulsator"]
3838
path = Carthage/Checkouts/Pulsator
3939
url = https://github.com/shu223/Pulsator.git
40+
[submodule "Carthage/Checkouts/ReactiveSwift"]
41+
path = Carthage/Checkouts/ReactiveSwift
42+
url = https://github.com/ReactiveCocoa/ReactiveSwift.git
43+
[submodule "Carthage/Checkouts/Runes"]
44+
path = Carthage/Checkouts/Runes
45+
url = https://github.com/thoughtbot/Runes.git
46+
[submodule "Carthage/Checkouts/ReactiveObjC"]
47+
path = Carthage/Checkouts/ReactiveObjC
48+
url = https://github.com/ReactiveCocoa/ReactiveObjC.git
49+
[submodule "Carthage/Checkouts/ReactiveObjCBridge"]
50+
path = Carthage/Checkouts/ReactiveObjCBridge
51+
url = https://github.com/ReactiveCocoa/ReactiveObjCBridge.git

Diff for: .swiftlint.yml

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ disabled_rules:
1010
- type_body_length
1111
- file_length
1212
- cyclomatic_complexity
13+
- unused_closure_parameter
14+
- void_return
15+
- syntactic_sugar # temorarily disabled since `[S.Iterator.Element]()` is not possible (bug?)
1316

1417
- force_cast
1518

Diff for: Cartfile.private

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
github "antitypical/Result"
1+
#github "antitypical/Result"
22
github "ReactiveCocoa/ReactiveCocoa"
3-
github "RACCommunity/Rex"
4-
github "inamiy/ReactiveArray" "3fce4d2"
5-
#github "Wolox/ReactiveArray"
3+
github "ReactiveCocoa/ReactiveObjCBridge" "master"
4+
github "inamiy/ReactiveArray" "master"
5+
###github "Wolox/ReactiveArray"
66
github "inamiy/ReactiveAutomaton"
77
github "ishkawa/APIKit"
88
github "thoughtbot/Curry"
99
github "thoughtbot/Argo"
10-
github "kylef/WebLinking.swift"
10+
github "kylef/WebLinking.swift" "master"
1111
github "robb/Cartography"
12-
github "Haneke/HanekeSwift"
12+
github "Haneke/HanekeSwift" "feature/swift-3"
1313
github "thii/FontAwesome.swift"
1414
github "shu223/Pulsator"

Diff for: Cartfile.resolved

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
github "thoughtbot/Argo" "v3.0.1"
2-
github "robb/Cartography" "0.6.0"
3-
github "thoughtbot/Curry" "v2.3.2"
4-
github "thii/FontAwesome.swift" "0.7.3"
5-
github "Haneke/HanekeSwift" "v0.10.1"
6-
github "shu223/Pulsator" "0.1.1"
7-
github "antitypical/Result" "2.1.3"
8-
github "kylef/WebLinking.swift" "1.0.1"
9-
github "ishkawa/APIKit" "2.0.5"
10-
github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
11-
github "inamiy/ReactiveArray" "3fce4d298eab6b41d9cc9cccea54d7adf7ade2e3"
12-
github "inamiy/ReactiveAutomaton" "0.1.0"
13-
github "RACCommunity/Rex" "0.11.0"
1+
github "robb/Cartography" "1.0.1"
2+
github "thoughtbot/Curry" "v3.0.0"
3+
github "thii/FontAwesome.swift" "1.1.0"
4+
github "Haneke/HanekeSwift" "1157a124ec699f4ad926cb054f1d0bfce88ae7a9"
5+
github "shu223/Pulsator" "0.3.0"
6+
github "ReactiveCocoa/ReactiveObjC" "2.1.2"
7+
github "antitypical/Result" "3.1.0"
8+
github "thoughtbot/Runes" "v4.0.1"
9+
github "kylef/WebLinking.swift" "fddbacc30deab8afe12ce1d3b78bd27c593a0c29"
10+
github "ishkawa/APIKit" "3.1.2"
11+
github "thoughtbot/Argo" "v4.1.1"
12+
github "ReactiveCocoa/ReactiveSwift" "1.0.0"
13+
github "inamiy/ReactiveArray" "e7722bb1aebb1e39fdcdf3ec131707e00110bfbe"
14+
github "inamiy/ReactiveAutomaton" "0.2.0"
15+
github "ReactiveCocoa/ReactiveCocoa" "5.0.0"
16+
github "ReactiveCocoa/ReactiveObjCBridge" "973aad9bfa730a947a33b182e1e67a6cdbef1ca1"

Diff for: Carthage/Checkouts/APIKit

Submodule APIKit updated 88 files

Diff for: Carthage/Checkouts/Argo

Submodule Argo updated 112 files

Diff for: Carthage/Checkouts/Cartography

Submodule Cartography updated 48 files

Diff for: Carthage/Checkouts/HanekeSwift

Submodule HanekeSwift updated 64 files

Diff for: Carthage/Checkouts/ReactiveCocoa

Submodule ReactiveCocoa updated 452 files

Diff for: Carthage/Checkouts/ReactiveObjC

Submodule ReactiveObjC added at 9747a90

Diff for: Carthage/Checkouts/ReactiveObjCBridge

Submodule ReactiveObjCBridge added at 973aad9

Diff for: Carthage/Checkouts/ReactiveSwift

Submodule ReactiveSwift added at 7920f19

Diff for: Carthage/Checkouts/Runes

Submodule Runes added at 727fcfe

Diff for: Carthage/Checkouts/WebLinking.swift

0 commit comments

Comments
 (0)