Adapted RxSwift 4.0 & RxDataSources 3.0 (#5)

* Update to RxSwift 4.0 and RxDataSources 3.0

* Fix Example

* Fix Example

* Update ASCollectionSectionedDataSource

* Update DataSource Proxies

Author: dangthaison91

.gitignore

@@ -0,0 +1,65 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output

.gitmodules

@@ -12,6 +12,7 @@
 	url = https://github.com/pinterest/PINCache.git
 [submodule "Carthage/Checkouts/RxSwift"]
 	url = https://github.com/ReactiveX/RxSwift.git
+	path = Carthage/Checkouts/RxSwift
 [submodule "Carthage/Checkouts/texture"]
 	path = Carthage/Checkouts/texture
 	url = https://github.com/texturegroup/texture.git

Cartfile.resolved

@@ -1,7 +1,7 @@
 git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
-github "ReactiveX/RxSwift" "3.6.1"
-github "RxSwiftCommunity/RxDataSources" "2.0.2"
+github "ReactiveX/RxSwift" "4.0.0"
+github "RxSwiftCommunity/RxDataSources" "3.0.2"
 github "pinterest/PINCache" "3.0.1-beta.5"
 github "pinterest/PINOperation" "1.0.3"
-github "pinterest/PINRemoteImage" "3.0.0-beta.11"
-github "texturegroup/texture" "2.4"
+github "pinterest/PINRemoteImage" "3.0.0-beta.12"
+github "texturegroup/texture" "2.5.1"

Carthage/Checkouts/PINRemoteImage

@@ -48,7 +48,7 @@ extension NumberSection: AnimatableSectionModelType {
 extension IntItem: IdentifiableType, Equatable {
     typealias Identity = Int
     var identity: Int {
-        return number.hashValue
+        return number
     }
 }
 
@@ -59,23 +59,24 @@ func ==(lhs: IntItem, rhs: IntItem) -> Bool {
 class ViewController: UIViewController {
 
     let tableNode = ASTableNode()
-    private let dataSource = RxASTableAnimatedDataSource<NumberSection>()
 
     private let disposeBag = DisposeBag()
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.addSubnode(tableNode)
 
-        dataSource.configureCell = { (_, tv, ip, i) in
+        let configureCell: ASTableSectionedDataSource<NumberSection>.ConfigureCell = { (_, tableNode, index, i) in
             let cell = ASTextCellNode()
             cell.text = "\(i.number)"
             return cell
         }
-
-        dataSource.titleForHeaderInSection = { (dataSource, section) -> String? in
+        
+        let titleForHeaderInSection: ASTableSectionedDataSource<NumberSection>.TitleForHeaderInSection = { (dataSource, section) -> String? in
             return dataSource[section].header
         }
 
+        let dataSource = RxASTableAnimatedDataSource<NumberSection>(configureCell: configureCell, titleForHeaderInSection: titleForHeaderInSection)
+
         Observable<Int>
             .interval(2.0, scheduler: MainScheduler.instance)
             .map { _ in
@@ -105,19 +106,19 @@ class ViewController: UIViewController {
     }
 }
 
-func $(_ numbers: [Int]) -> [IntItem] {
+func items(_ numbers: [Int]) -> [IntItem] {
     return numbers.map { IntItem(number: $0, date: Date()) }
 }
 
 let _initialValue: [NumberSection] = [
-    NumberSection(header: "section 1", numbers: $([1, 2, 3]), updated: Date()),
-    NumberSection(header: "section 2", numbers: $([4, 5, 6]), updated: Date()),
-    NumberSection(header: "section 3", numbers: $([7, 8, 9]), updated: Date()),
-    NumberSection(header: "section 4", numbers: $([10, 11, 12]), updated: Date()),
-    NumberSection(header: "section 5", numbers: $([13, 14, 15]), updated: Date()),
-    NumberSection(header: "section 6", numbers: $([16, 17, 18]), updated: Date()),
-    NumberSection(header: "section 7", numbers: $([19, 20, 21]), updated: Date()),
-    NumberSection(header: "section 8", numbers: $([22, 23, 24]), updated: Date()),
-    NumberSection(header: "section 9", numbers: $([25, 26, 27]), updated: Date()),
-    NumberSection(header: "section 10", numbers: $([28, 29, 30]), updated: Date())
+    NumberSection(header: "section 1", numbers: items([1, 2, 3]), updated: Date()),
+    NumberSection(header: "section 2", numbers: items([4, 5, 6]), updated: Date()),
+    NumberSection(header: "section 3", numbers: items([7, 8, 9]), updated: Date()),
+    NumberSection(header: "section 4", numbers: items([10, 11, 12]), updated: Date()),
+    NumberSection(header: "section 5", numbers: items([13, 14, 15]), updated: Date()),
+    NumberSection(header: "section 6", numbers: items([16, 17, 18]), updated: Date()),
+    NumberSection(header: "section 7", numbers: items([19, 20, 21]), updated: Date()),
+    NumberSection(header: "section 8", numbers: items([22, 23, 24]), updated: Date()),
+    NumberSection(header: "section 9", numbers: items([25, 26, 27]), updated: Date()),
+    NumberSection(header: "section 10", numbers: items([28, 29, 30]), updated: Date())
 ]

Carthage/Checkouts/RxDataSources

@@ -1,5 +1,5 @@
 PODS:
-  - Differentiator (2.0.2)
+  - Differentiator (3.0.2)
   - PINCache (3.0.1-beta.5):
     - PINCache/Arc-exception-safe (= 3.0.1-beta.5)
     - PINCache/Core (= 3.0.1-beta.5)
@@ -8,21 +8,21 @@ PODS:
   - PINCache/Core (3.0.1-beta.5):
     - PINOperation (= 1.0.3)
   - PINOperation (1.0.3)
-  - PINRemoteImage/Core (3.0.0-beta.11):
+  - PINRemoteImage/Core (3.0.0-beta.12):
     - PINOperation
-  - PINRemoteImage/iOS (3.0.0-beta.11):
+  - PINRemoteImage/iOS (3.0.0-beta.12):
     - PINRemoteImage/Core
-  - PINRemoteImage/PINCache (3.0.0-beta.11):
+  - PINRemoteImage/PINCache (3.0.0-beta.12):
     - PINCache (= 3.0.1-beta.5)
     - PINRemoteImage/Core
-  - RxCocoa (3.6.1):
-    - RxSwift (~> 3.6)
-  - RxSwift (3.6.1)
-  - Texture (2.4):
-    - Texture/PINRemoteImage (= 2.4)
-  - Texture/Core (2.4)
-  - Texture/PINRemoteImage (2.4):
-    - PINRemoteImage/iOS (= 3.0.0-beta.11)
+  - RxCocoa (4.0.0):
+    - RxSwift (~> 4.0)
+  - RxSwift (4.0.0)
+  - Texture (2.5.1):
+    - Texture/PINRemoteImage (= 2.5.1)
+  - Texture/Core (2.5.1)
+  - Texture/PINRemoteImage (2.5.1):
+    - PINRemoteImage/iOS (= 3.0.0-beta.12)
     - PINRemoteImage/PINCache
     - Texture/Core
 
@@ -33,14 +33,14 @@ DEPENDENCIES:
   - Texture
 
 SPEC CHECKSUMS:
-  Differentiator: caa9b3957981a2ac8e6b2eac8a676af461caa604
+  Differentiator: a87be69eba49ec4ab460c7671143ee3a9eececfd
   PINCache: 98e7b1ef782824ad231ade51987c218b758c30d8
   PINOperation: ac23db44796d4a564ecf9b5ea7163510f579b71d
-  PINRemoteImage: d71988f11914a050d6d4cf51efc4ad1de8c0a9d8
-  RxCocoa: 84a08739ab186248c7f31ce4ee92d6f8a947d690
-  RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
-  Texture: a5526314780eab35f642d956627f09316b9514e8
+  PINRemoteImage: 0cefe720c2612960bd360710efbd6c73a1991d5f
+  RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
+  RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
+  Texture: c3f06e344aa091667b7a56002e525cde674d021a
 
 PODFILE CHECKSUM: df58f9cead49c76984203f4eab4ded96071c8990
 
-COCOAPODS: 1.3.0
+COCOAPODS: 1.3.1

Carthage/Checkouts/RxSwift

@@ -16,7 +16,7 @@
 ## Requirements
 
 - iOS 8.0+
-- Xcode 8.0+
+- Xcode 9.0+
 
 ## Installation
 

Carthage/Checkouts/texture

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
      s.name = 'RxASDataSources'
-     s.version = '0.2'
+     s.version = '0.3'
      s.license = { :type => "MIT", :file => "LICENSE" }
      s.summary = 'RxDataSources for AsyncDisplayKit/Texture ASTableNode/ASCollectionNode'
      s.homepage = 'https://github.com/dangthaison91/RxASDataSources'
@@ -12,9 +12,9 @@ Pod::Spec.new do |s|
 
      s.source_files  = "Sources/**/*.swift"
      s.framework  = "Foundation"
-     s.dependency 'RxSwift', '~> 3.4'
-     s.dependency 'RxCocoa', '~> 3.4'
-     s.dependency 'Differentiator', '~> 2.0'
-     s.dependency 'Texture', '~> 2.0'
+     s.dependency 'RxSwift', '~> 4.0'
+     s.dependency 'RxCocoa', '~> 4.0'
+     s.dependency 'Differentiator', '~> 3.0'
+     s.dependency 'Texture', '~> 2.5'
 
 end