Updates for Xcode 8 beta 6.

kzaher · kzaher · commit 56c20b3d4c6a · 2016-08-19T15:51:28.000+02:00
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "091b12242abc774dfea565f1cb518d749a34b40a"
+github "ReactiveX/RxSwift" "9b1f22e6a02bdc2ff511069ccb80781c06b1ec6e"
diff --git a/Podfile.lock b/Podfile.lock
@@ -17,15 +17,15 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   RxCocoa:
-    :commit: 091b12242abc774dfea565f1cb518d749a34b40a
+    :commit: 9b1f22e6a02bdc2ff511069ccb80781c06b1ec6e
     :git: git@github.com:ReactiveX/RxSwift.git
   RxSwift:
-    :commit: 091b12242abc774dfea565f1cb518d749a34b40a
+    :commit: 9b1f22e6a02bdc2ff511069ccb80781c06b1ec6e
     :git: git@github.com:ReactiveX/RxSwift.git
 
 SPEC CHECKSUMS:
-  RxCocoa: 89ab00d5753502520227940e3a0e0a0413683c6b
-  RxSwift: 77f3a0b15324baa7a1c9bfa9f199648a82424e26
+  RxCocoa: c611f45c19ef2e159fe0ad4279684190b385e061
+  RxSwift: 799f527c4aa01e235fbccfb22f46d1c381aa4151
 
 PODFILE CHECKSUM: 810d5edbe5528082fd2e6c64ec9959cbc8e24ec4
 
diff --git a/Sources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift b/Sources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift
@@ -13,42 +13,42 @@ import RxSwift
 import RxCocoa
 #endif
 
-extension UITableView {
-    @available(*, deprecated:0.7, renamed:"rx_itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
-    public func rx_itemsAnimatedWithDataSource<
+extension Reactive where Base: UITableView {
+    @available(*, deprecated:0.7, renamed:"itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
+    public func itemsAnimatedWithDataSource<
             DataSource: RxTableViewDataSourceType & UITableViewDataSource,
             S: Sequence,
-            O: ObservableType
-        where
-            DataSource.Element == S,
-            O.E == S,
-            S.Iterator.Element: AnimatableSectionModelType
-        >
+            O: ObservableType>
         (_ dataSource: DataSource)
-        -> (source: O)
-        -> Disposable  {
+        -> (_ source: O)
+        -> Disposable
+        where
+        DataSource.Element == S,
+        O.E == S,
+        S.Iterator.Element: AnimatableSectionModelType
+    {
         return  { source in
-            return self.rx_itemsWithDataSource(dataSource)(source: source)
+            return self.items(dataSource: dataSource)(source)
         }
     }
 }
 
-extension UICollectionView {
-    @available(*, deprecated:0.7, renamed:"rx_itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
-    public func rx_itemsAnimatedWithDataSource<
+extension Reactive where Base: UICollectionView {
+    @available(*, deprecated:0.7, renamed:"itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
+    public func itemsAnimatedWithDataSource<
             DataSource: RxCollectionViewDataSourceType & UICollectionViewDataSource,
             S: Sequence,
-            O: ObservableType
-        where
-            DataSource.Element == S,
-            O.E == S,
-            S.Iterator.Element: AnimatableSectionModelType
-        >
+            O: ObservableType>
         (_ dataSource: DataSource)
-        -> (source: O)
-        -> Disposable  {
+        -> (_ source: O)
+        -> Disposable
+        where
+        DataSource.Element == S,
+        O.E == S,
+        S.Iterator.Element: AnimatableSectionModelType
+    {
         return { source in
-            return self.rx_itemsWithDataSource(dataSource)(source: source)
+            return self.items(dataSource: dataSource)(source)
         }
     }
 }
diff --git a/Sources/DataSources/CollectionViewSectionedDataSource.swift b/Sources/DataSources/CollectionViewSectionedDataSource.swift
@@ -142,14 +142,14 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
         }
     }
     
-    public var moveItem: ((CollectionViewSectionedDataSource<S>, sourceIndexPath:IndexPath, destinationIndexPath:IndexPath) -> Void)? {
+    public var moveItem: ((CollectionViewSectionedDataSource<S>, _ sourceIndexPath:IndexPath, _ destinationIndexPath:IndexPath) -> Void)? {
         didSet {
             #if DEBUG
                 ensureNotMutatedAfterBinding()
             #endif
         }
     }
-    public var canMoveItemAtIndexPath: ((CollectionViewSectionedDataSource<S>, indexPath:IndexPath) -> Bool)? {
+    public var canMoveItemAtIndexPath: ((CollectionViewSectionedDataSource<S>, IndexPath) -> Bool)? {
         didSet {
             #if DEBUG
             ensureNotMutatedAfterBinding()
@@ -196,7 +196,7 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
     }
     
     override func _rx_collectionView(_ collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: IndexPath) -> Bool {
-        guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath: indexPath) else {
+        guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath) else {
             return super._rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
         }
         
diff --git a/Sources/DataSources/TableViewSectionedDataSource.swift b/Sources/DataSources/TableViewSectionedDataSource.swift
@@ -165,29 +165,29 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
         }
     }
     
-    public var titleForHeaderInSection: ((RxTableViewSectionedDataSource<S>, section: Int) -> String?)? {
+    public var titleForHeaderInSection: ((RxTableViewSectionedDataSource<S>, Int) -> String?)? {
         didSet {
             #if DEBUG
                 ensureNotMutatedAfterBinding()
             #endif
         }
     }
-    public var titleForFooterInSection: ((RxTableViewSectionedDataSource<S>, section: Int) -> String?)? {
+    public var titleForFooterInSection: ((RxTableViewSectionedDataSource<S>, Int) -> String?)? {
         didSet {
             #if DEBUG
                 ensureNotMutatedAfterBinding()
             #endif
         }
     }
     
-    public var canEditRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: IndexPath) -> Bool)? {
+    public var canEditRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, IndexPath) -> Bool)? {
         didSet {
             #if DEBUG
                 ensureNotMutatedAfterBinding()
             #endif
         }
     }
-    public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: IndexPath) -> Bool)? {
+    public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, IndexPath) -> Bool)? {
         didSet {
             #if DEBUG
                 ensureNotMutatedAfterBinding()
@@ -205,7 +205,7 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
             #endif
         }
     }
-    public var sectionForSectionIndexTitle:((RxTableViewSectionedDataSource<S>, title: String, index: Int) -> Int)? {
+    public var sectionForSectionIndexTitle:((RxTableViewSectionedDataSource<S>, _ title: String, _ index: Int) -> Int)? {
         didSet {
             #if DEBUG
             ensureNotMutatedAfterBinding()
@@ -242,23 +242,23 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
     }
     
     override func _rx_tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        return titleForHeaderInSection?(self, section: section)
+        return titleForHeaderInSection?(self, section)
     }
     
     override func _rx_tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        return titleForFooterInSection?(self, section: section)
+        return titleForFooterInSection?(self, section)
     }
     
     override func _rx_tableView(_ tableView: UITableView, canEditRowAtIndexPath indexPath: IndexPath) -> Bool {
-        guard let canEditRow = canEditRowAtIndexPath?(self, indexPath: indexPath) else {
+        guard let canEditRow = canEditRowAtIndexPath?(self, indexPath) else {
             return super._rx_tableView(tableView, canEditRowAtIndexPath: indexPath)
         }
         
         return canEditRow
     }
    
     override func _rx_tableView(_ tableView: UITableView, canMoveRowAtIndexPath indexPath: IndexPath) -> Bool {
-        guard let canMoveRow = canMoveRowAtIndexPath?(self, indexPath: indexPath) else {
+        guard let canMoveRow = canMoveRowAtIndexPath?(self, indexPath) else {
             return super._rx_tableView(tableView, canMoveRowAtIndexPath: indexPath)
         }
         
@@ -279,7 +279,7 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
     }
     
     override func _rx_tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, atIndex index: Int) -> Int {
-        guard let section = sectionForSectionIndexTitle?(self, title: title, index: index) else {
+        guard let section = sectionForSectionIndexTitle?(self, title, index) else {
             return super._rx_tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)
         }
         

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveX/RxSwift" "091b12242abc774dfea565f1cb518d749a34b40a"`
	`1`	`+github "ReactiveX/RxSwift" "9b1f22e6a02bdc2ff511069ccb80781c06b1ec6e"`
Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,14 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`- public var moveItem: ((CollectionViewSectionedDataSource<S>, sourceIndexPath:IndexPath, destinationIndexPath:IndexPath) -> Void)? {`
	`145`	`+ public var moveItem: ((CollectionViewSectionedDataSource<S>, _ sourceIndexPath:IndexPath, _ destinationIndexPath:IndexPath) -> Void)? {`
`146`	`146`	`didSet {`
`147`	`147`	`#if DEBUG`
`148`	`148`	`ensureNotMutatedAfterBinding()`
`149`	`149`	`#endif`
`150`	`150`	`}`
`151`	`151`	`}`
`152`		`- public var canMoveItemAtIndexPath: ((CollectionViewSectionedDataSource<S>, indexPath:IndexPath) -> Bool)? {`
	`152`	`+ public var canMoveItemAtIndexPath: ((CollectionViewSectionedDataSource<S>, IndexPath) -> Bool)? {`
`153`	`153`	`didSet {`
`154`	`154`	`#if DEBUG`
`155`	`155`	`ensureNotMutatedAfterBinding()`
`@@ -196,7 +196,7 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`override func _rx_collectionView(_ collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: IndexPath) -> Bool {`
`199`		`- guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath: indexPath) else {`
	`199`	`+ guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath) else {`
`200`	`200`	`return super._rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -165,29 +165,29 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- public var titleForHeaderInSection: ((RxTableViewSectionedDataSource<S>, section: Int) -> String?)? {`
	`168`	`+ public var titleForHeaderInSection: ((RxTableViewSectionedDataSource<S>, Int) -> String?)? {`
`169`	`169`	`didSet {`
`170`	`170`	`#if DEBUG`
`171`	`171`	`ensureNotMutatedAfterBinding()`
`172`	`172`	`#endif`
`173`	`173`	`}`
`174`	`174`	`}`
`175`		`- public var titleForFooterInSection: ((RxTableViewSectionedDataSource<S>, section: Int) -> String?)? {`
	`175`	`+ public var titleForFooterInSection: ((RxTableViewSectionedDataSource<S>, Int) -> String?)? {`
`176`	`176`	`didSet {`
`177`	`177`	`#if DEBUG`
`178`	`178`	`ensureNotMutatedAfterBinding()`
`179`	`179`	`#endif`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`		`- public var canEditRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: IndexPath) -> Bool)? {`
	`183`	`+ public var canEditRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, IndexPath) -> Bool)? {`
`184`	`184`	`didSet {`
`185`	`185`	`#if DEBUG`
`186`	`186`	`ensureNotMutatedAfterBinding()`
`187`	`187`	`#endif`
`188`	`188`	`}`
`189`	`189`	`}`
`190`		`- public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: IndexPath) -> Bool)? {`
	`190`	`+ public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, IndexPath) -> Bool)? {`
`191`	`191`	`didSet {`
`192`	`192`	`#if DEBUG`
`193`	`193`	`ensureNotMutatedAfterBinding()`
`@@ -205,7 +205,7 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`205`	`205`	`#endif`
`206`	`206`	`}`
`207`	`207`	`}`
`208`		`- public var sectionForSectionIndexTitle:((RxTableViewSectionedDataSource<S>, title: String, index: Int) -> Int)? {`
	`208`	`+ public var sectionForSectionIndexTitle:((RxTableViewSectionedDataSource<S>, _ title: String, _ index: Int) -> Int)? {`
`209`	`209`	`didSet {`
`210`	`210`	`#if DEBUG`
`211`	`211`	`ensureNotMutatedAfterBinding()`
`@@ -242,23 +242,23 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`override func _rx_tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {`
`245`		`- return titleForHeaderInSection?(self, section: section)`
	`245`	`+ return titleForHeaderInSection?(self, section)`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`override func _rx_tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {`
`249`		`- return titleForFooterInSection?(self, section: section)`
	`249`	`+ return titleForFooterInSection?(self, section)`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`override func _rx_tableView(_ tableView: UITableView, canEditRowAtIndexPath indexPath: IndexPath) -> Bool {`
`253`		`- guard let canEditRow = canEditRowAtIndexPath?(self, indexPath: indexPath) else {`
	`253`	`+ guard let canEditRow = canEditRowAtIndexPath?(self, indexPath) else {`
`254`	`254`	`return super._rx_tableView(tableView, canEditRowAtIndexPath: indexPath)`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`return canEditRow`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`override func _rx_tableView(_ tableView: UITableView, canMoveRowAtIndexPath indexPath: IndexPath) -> Bool {`
`261`		`- guard let canMoveRow = canMoveRowAtIndexPath?(self, indexPath: indexPath) else {`
	`261`	`+ guard let canMoveRow = canMoveRowAtIndexPath?(self, indexPath) else {`
`262`	`262`	`return super._rx_tableView(tableView, canMoveRowAtIndexPath: indexPath)`
`263`	`263`	`}`
`264`	`264`
`@@ -279,7 +279,7 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`override func _rx_tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, atIndex index: Int) -> Int {`
`282`		`- guard let section = sectionForSectionIndexTitle?(self, title: title, index: index) else {`
	`282`	`+ guard let section = sectionForSectionIndexTitle?(self, title, index) else {`
`283`	`283`	`return super._rx_tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)`
`284`	`284`	`}`
`285`	`285`