Merge pull request #3 from Bruce-pac/master

Bruce-pac · web-flow · commit 9c18cd5ed089 · 2019-10-21T23:01:28.000+08:00
API CHANGE: replace objects(dataSource:) with objects(for:).
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -7,7 +7,7 @@ PODS:
   - RxCocoa (5.0.0):
     - RxRelay (~> 5)
     - RxSwift (~> 5)
-  - RxIGListKit (1.0.0):
+  - RxIGListKit (1.0.1):
     - IGListKit
     - RxCocoa
   - RxRelay (5.0.0):
@@ -31,10 +31,10 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   IGListKit: 7a5d788e9fb746bcd402baa8e8b24bc3bd2a5a07
   RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
-  RxIGListKit: 9bead79aa1e3be6a7a3e06c2359b2e8fc98f28ea
+  RxIGListKit: 3227968d97c075acfa90f305336cc328468c8759
   RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
   RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
 
 PODFILE CHECKSUM: 2f55325866dc3334483180691ade683b2d17a20f
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.5
diff --git a/Example/Pods/Local Podspecs/RxIGListKit.podspec.json b/Example/Pods/Local Podspecs/RxIGListKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/Pods-RxIGListKit_Example/Pods-RxIGListKit_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-RxIGListKit_Example/Pods-RxIGListKit_Example-frameworks.sh
diff --git a/Example/Pods/Target Support Files/Pods-RxIGListKit_Tests/Pods-RxIGListKit_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-RxIGListKit_Tests/Pods-RxIGListKit_Tests.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-RxIGListKit_Tests/Pods-RxIGListKit_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-RxIGListKit_Tests/Pods-RxIGListKit_Tests.release.xcconfig
diff --git a/Example/Pods/Target Support Files/RxIGListKit/RxIGListKit-Info.plist b/Example/Pods/Target Support Files/RxIGListKit/RxIGListKit-Info.plist
diff --git a/Example/RxIGListKit.xcodeproj/project.pbxproj b/Example/RxIGListKit.xcodeproj/project.pbxproj
@@ -452,13 +452,9 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Example/RxIGListKit/EmptyViewController.swift b/Example/RxIGListKit/EmptyViewController.swift
@@ -53,7 +53,7 @@ class EmptyViewController: UIViewController {
             return self?.emptyLabel
         })
 
-        objectSignal.bind(to: adapter.rx.objects(dataSource: dataSource)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: dataSource)).disposed(by: bag)
 
         let addSignal = addItem.rx.tap.withLatestFrom(objectSignal).map { (old) -> [Int] in
             let count = old.count
diff --git a/Example/RxIGListKit/HorizontalSectionController.swift b/Example/RxIGListKit/HorizontalSectionController.swift
@@ -31,7 +31,7 @@ final class HorizontalSectionController: ListSectionController {
     lazy var adapter: ListAdapter = {
         let adapter = ListAdapter(updater: ListAdapterUpdater(),
                                   viewController: self.viewController)
-        objectSignal.bind(to: adapter.rx.objects(dataSource: dataSource)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: dataSource)).disposed(by: bag)
         return adapter
     }()
 
diff --git a/Example/RxIGListKit/MixedDataViewController.swift b/Example/RxIGListKit/MixedDataViewController.swift
@@ -105,7 +105,7 @@ class MixedDataViewController: UIViewController {
                 return UserSectionController(isReorderable: true)
             }
         })
-        itemSignal.bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        itemSignal.bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
         adapter.rx.moveObject(ds).map({ (_,_,to) -> [MixedDataSection] in
            return to.map({ (obj) -> MixedDataSection in
                 switch obj {
diff --git a/Example/RxIGListKit/NestedAdapterViewController.swift b/Example/RxIGListKit/NestedAdapterViewController.swift
@@ -46,7 +46,7 @@ class NestedAdapterViewController: UIViewController {
         super.viewDidLoad()
         view.addSubview(collectionView)
         adapter.collectionView = collectionView
-        objectSignal.bind(to: adapter.rx.objects(dataSource: dataSource)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: dataSource)).disposed(by: bag)
         let objects = data.map { (ele) -> NestedAdapterSection in
             switch ele {
             case is String:
diff --git a/Example/RxIGListKit/ReorderableViewController.swift b/Example/RxIGListKit/ReorderableViewController.swift
@@ -52,7 +52,7 @@ final class ReorderableViewController: UIViewController {
         let moveSignal = adapter.rx.moveObject(dataSource).map { (_, _, to) -> [String] in
             return to as! [String]
         }
-        Observable.merge(objectSignal, moveSignal).bind(to: adapter.rx.objects(dataSource: dataSource)).disposed(by: bag)
+        Observable.merge(objectSignal, moveSignal).bind(to: adapter.rx.objects(for: dataSource)).disposed(by: bag)
 
 //        if #available(iOS 9.0, *) {
 //            adapter.moveDelegate = self
diff --git a/Example/RxIGListKit/SearchViewController.swift b/Example/RxIGListKit/SearchViewController.swift
@@ -81,7 +81,7 @@ class SearchViewController: UIViewController {
         let ds = RxListAdapterDataSource<NSString>(sectionControllerProvider: { (_, _) -> ListSectionController in
             LabelSectionController()
         })
-        itemSignal.bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        itemSignal.bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
     }
 
 }
diff --git a/Example/RxIGListKit/StackedViewController.swift b/Example/RxIGListKit/StackedViewController.swift
@@ -46,7 +46,7 @@ final class StackedViewController: UIViewController {
             return sectionController
         })
         let objectSignal = Observable.just(data)
-        objectSignal.bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
 
     }
 
diff --git a/Example/RxIGListKit/StoryboardViewController.swift b/Example/RxIGListKit/StoryboardViewController.swift
@@ -72,7 +72,7 @@ final class StoryboardViewController: UIViewController, StoryboardLabelSectionCo
             sectionController.delegate = self
             return sectionController
         })
-        objectSignal.bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
         objectSignal.onNext(people)
     }
 
diff --git a/Example/RxIGListKit/TailLoadingViewController.swift b/Example/RxIGListKit/TailLoadingViewController.swift
@@ -50,7 +50,7 @@ class TailLoadingViewController: UIViewController {
                 return LabelSectionController()
             }
         })
-        itemSignal.debug().bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        itemSignal.debug().bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
 
         let footDrag = adapter.rx.willEndDragging.map { (view, _, offset) -> Bool in
             let distance = view.contentSize.height - (offset.pointee.y + view.bounds.height)
diff --git a/Example/RxIGListKit/WorkingRangeViewController.swift b/Example/RxIGListKit/WorkingRangeViewController.swift
@@ -46,7 +46,7 @@ final class WorkingRangeViewController: UIViewController {
             return WorkingRangeSectionController()
         })
 
-        objectSignal.bind(to: adapter.rx.objects(dataSource: ds)).disposed(by: bag)
+        objectSignal.bind(to: adapter.rx.objects(for: ds)).disposed(by: bag)
 
     }
 
diff --git a/RxIGListKit.podspec b/RxIGListKit.podspec
@@ -8,15 +8,9 @@
 
 Pod::Spec.new do |s|
   s.name             = 'RxIGListKit'
-  s.version          = '1.0.0'
+  s.version          = '1.0.1'
   s.summary          = "A RxSwift wrapper for Instagram IGListKit."
 
-# This description is used to generate tags and improve search results.
-#   * Think: What does it do? Why did you write it? What is the focus?
-#   * Try to keep it short, snappy and to the point.
-#   * Write the description between the DESC delimiters below.
-#   * Finally, don't worry about the indent, CocoaPods strips it!
-
   s.description      = <<-DESC
   A RxSwift wrapper for Instagram IGListKit - A data-driven UICollectionView framework for building fast and flexible lists.
   RxIGListKit bring IGListKit into Reactive world.
@@ -30,15 +24,12 @@ Pod::Spec.new do |s|
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
   s.ios.deployment_target = '8.0'
+  s.tvos.deployment_target = '9.0'
+
   s.swift_version = '5.0'
 
   s.source_files = 'RxIGListKit/Classes/**/*'
-  
-  # s.resource_bundles = {
-  #   'RxIGListKit' => ['RxIGListKit/Assets/*.png']
-  # }
 
-  # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'RxCocoa'
   s.dependency 'IGListKit'
diff --git a/RxIGListKit/Classes/IGListAdapter+Rx.swift b/RxIGListKit/Classes/IGListAdapter+Rx.swift
@@ -20,7 +20,14 @@ extension Reactive where Base == ListAdapter {
      - parameter source: Observable sequence of items.
      - returns: Disposable object that can be used to unbind.
      */
+    @available(*, deprecated, message: "It will be removed in the future.", renamed: "objects(for:)")
     public func objects<DataSource: ListAdapterDataSource & RxListAdapterDataSourceType, O: ObservableType>(dataSource: DataSource) ->
+        (_ source: O) -> Disposable
+        where DataSource.Element == O.Element {
+            return objects(for: dataSource)
+    }
+
+    public func objects<DataSource: ListAdapterDataSource & RxListAdapterDataSourceType, O: ObservableType>(for dataSource: DataSource) ->
         (_ source: O) -> Disposable
         where DataSource.Element == O.Element {
         base.dataSource = dataSource
@@ -58,7 +65,7 @@ extension Reactive where Base == ListAdapter {
                             configureBlock1(obj, cell)
                         }, sizeBlock: sizeBlock, emptyViewProvider: emptyViewProvider)
                         dataSource.delegate = selectionDelegate
-                        return self.objects(dataSource: dataSource)(source)
+                        return self.objects(for: dataSource)(source)
                     }
                 }
             }
@@ -90,7 +97,7 @@ extension Reactive where Base == ListAdapter {
                             configureBlock1(obj, cell)
                         }, sizeBlock: sizeBlock, emptyViewProvider: emptyViewProvider)
                         dataSource.delegate = selectionDelegate
-                        return self.objects(dataSource: dataSource)(source)
+                        return self.objects(for: dataSource)(source)
                     }
                 }
             }
@@ -123,7 +130,7 @@ extension Reactive where Base == ListAdapter {
                             configureBlock1(obj, cell)
                         }, sizeBlock: sizeBlock, emptyViewProvider: emptyViewProvider)
                         dataSource.delegate = selectionDelegate
-                        return self.objects(dataSource: dataSource)(source)
+                        return self.objects(for: dataSource)(source)
                     }
                 }
             }
