Skip to content

Commit e26e3ab

Browse files
kzaherkzaher
committed
Merge branch 'svdo-swift4.0' into swift4.0
2 parents edd39e2 + eca1fda commit e26e3ab

File tree

204 files changed

+6272
-5346
lines changed

Some content is hidden

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

204 files changed

+6272
-5346
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 3.0
1+
github "ReactiveX/RxSwift" ~> 4.0

‎Example/Example2_RandomizedSectionsAnimation.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ extension ViewController {
129129
*/
130130

131131
return (0 ..< nSections).map { (i: Int) in
132-
NumberSection(header: "Section \(i + 1)", numbers: $(Array(i * nItems ..< (i + 1) * nItems)), updated: Date())
132+
NumberSection(header: "Section \(i + 1)", numbers: `$`(Array(i * nItems ..< (i + 1) * nItems)), updated: Date())
133133
}
134134
#else
135135
return _initialValue
@@ -140,19 +140,19 @@ extension ViewController {
140140
}
141141

142142
let _initialValue: [NumberSection] = [
143-
NumberSection(header: "section 1", numbers: $([1, 2, 3]), updated: Date()),
144-
NumberSection(header: "section 2", numbers: $([4, 5, 6]), updated: Date()),
145-
NumberSection(header: "section 3", numbers: $([7, 8, 9]), updated: Date()),
146-
NumberSection(header: "section 4", numbers: $([10, 11, 12]), updated: Date()),
147-
NumberSection(header: "section 5", numbers: $([13, 14, 15]), updated: Date()),
148-
NumberSection(header: "section 6", numbers: $([16, 17, 18]), updated: Date()),
149-
NumberSection(header: "section 7", numbers: $([19, 20, 21]), updated: Date()),
150-
NumberSection(header: "section 8", numbers: $([22, 23, 24]), updated: Date()),
151-
NumberSection(header: "section 9", numbers: $([25, 26, 27]), updated: Date()),
152-
NumberSection(header: "section 10", numbers: $([28, 29, 30]), updated: Date())
143+
NumberSection(header: "section 1", numbers: `$`([1, 2, 3]), updated: Date()),
144+
NumberSection(header: "section 2", numbers: `$`([4, 5, 6]), updated: Date()),
145+
NumberSection(header: "section 3", numbers: `$`([7, 8, 9]), updated: Date()),
146+
NumberSection(header: "section 4", numbers: `$`([10, 11, 12]), updated: Date()),
147+
NumberSection(header: "section 5", numbers: `$`([13, 14, 15]), updated: Date()),
148+
NumberSection(header: "section 6", numbers: `$`([16, 17, 18]), updated: Date()),
149+
NumberSection(header: "section 7", numbers: `$`([19, 20, 21]), updated: Date()),
150+
NumberSection(header: "section 8", numbers: `$`([22, 23, 24]), updated: Date()),
151+
NumberSection(header: "section 9", numbers: `$`([25, 26, 27]), updated: Date()),
152+
NumberSection(header: "section 10", numbers: `$`([28, 29, 30]), updated: Date())
153153
]
154154

155-
func $(_ numbers: [Int]) -> [IntItem] {
155+
func `$`(_ numbers: [Int]) -> [IntItem] {
156156
return numbers.map { IntItem(number: $0, date: Date()) }
157157
}
158158

‎Example/Example3_TableViewEditing.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ class EditingExampleViewController: UIViewController {
7777
return ds[section].header
7878
}
7979

80-
dataSource.canEditRowAtIndexPath = { _ in
80+
dataSource.canEditRowAtIndexPath = { _, _ in
8181
return true
8282
}
83-
dataSource.canMoveRowAtIndexPath = { _ in
83+
dataSource.canMoveRowAtIndexPath = { _, _ in
8484
return true
8585
}
8686
}

‎Example/Views/UIKitExtensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extension UITableViewCell: ReusableView {
2525

2626
extension UITableView {
2727

28-
func dequeueReusableCell<T: UITableViewCell>(forIndexPath indexPath: IndexPath) -> T where T: ReusableView {
28+
func dequeueReusableCell<T: UITableViewCell>(forIndexPath indexPath: IndexPath) -> T {
2929
guard let cell = dequeueReusableCell(withIdentifier: T.reuseIdentifier, for: indexPath) as? T else {
3030
fatalError("Could not dequeue cell with identifier: \(T.reuseIdentifier)")
3131
}

‎Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ platform :ios, '8.0'
22
use_frameworks!
33

44
def common
5-
pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
6-
pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
5+
pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'swift4.0'
6+
pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'swift4.0'
77
end
88

99
target 'RxDataSources' do

‎Podfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
PODS:
2-
- RxCocoa (3.4.0):
3-
- RxSwift (~> 3.4)
4-
- RxSwift (3.4.0)
2+
- RxCocoa (4.0.0-alpha.0):
3+
- RxSwift (~> 4.0.0-alpha.0)
4+
- RxSwift (4.0.0-alpha.0)
55

66
DEPENDENCIES:
7-
- RxCocoa (from `[email protected]:ReactiveX/RxSwift.git`, branch `master`)
8-
- RxSwift (from `[email protected]:ReactiveX/RxSwift.git`, branch `master`)
7+
- RxCocoa (from `[email protected]:ReactiveX/RxSwift.git`, branch `swift4.0`)
8+
- RxSwift (from `[email protected]:ReactiveX/RxSwift.git`, branch `swift4.0`)
99

1010
EXTERNAL SOURCES:
1111
RxCocoa:
12-
:branch: master
12+
:branch: swift4.0
1313
:git: [email protected]:ReactiveX/RxSwift.git
1414
RxSwift:
15-
:branch: master
15+
:branch: swift4.0
1616
:git: [email protected]:ReactiveX/RxSwift.git
1717

1818
CHECKOUT OPTIONS:
1919
RxCocoa:
20-
:commit: 1048219ea8ed777ee7b2655888caae6f61268f7c
20+
:commit: 9fc634c07a2842c93e483c1f5284b23dbb83d705
2121
:git: [email protected]:ReactiveX/RxSwift.git
2222
RxSwift:
23-
:commit: 1048219ea8ed777ee7b2655888caae6f61268f7c
23+
:commit: 9fc634c07a2842c93e483c1f5284b23dbb83d705
2424
:git: [email protected]:ReactiveX/RxSwift.git
2525

2626
SPEC CHECKSUMS:
27-
RxCocoa: 340254e41293a97d2be220592ea7d1e73980b1d5
28-
RxSwift: c744f5eb1c13a8acce49bb40fda553da7bf31046
27+
RxCocoa: d57cc4a5b88c5179b3ca7fe30d0ab0d928e886ff
28+
RxSwift: 6946957e4e99243ea7c9bba38afa06b1363b0048
2929

30-
PODFILE CHECKSUM: 29bf31f6a813ce527b77481cfb115102d889c025
30+
PODFILE CHECKSUM: dd653991f55ded635124ebca59abede8af193ba5
3131

32-
COCOAPODS: 1.2.0
32+
COCOAPODS: 1.2.1

‎Pods/Local Podspecs/RxCocoa.podspec.json

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

‎Pods/Local Podspecs/RxSwift.podspec.json

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

‎Pods/Manifest.lock

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

0 commit comments

Comments
 (0)