Skip to content

Commit

Permalink
Release 1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
OhKanghoon committed May 19, 2019
1 parent 65c0e66 commit 1cb6770
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PODS:
- RxCocoa (5.0.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxDataSources-Texture (1.2.0):
- RxDataSources-Texture (1.2.1):
- Differentiator (~> 4.0)
- RxCocoa (~> 5.0)
- RxSwift (~> 5.0)
Expand Down Expand Up @@ -88,7 +88,7 @@ SPEC CHECKSUMS:
PINRemoteImage: d6d51c5d2adda55f1ce30c96e850b6c4ebd2856a
RxAlamofire: e7875a012aff55345672d0f70a2a9cd6aeb0f211
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
RxDataSources-Texture: f849e46f05f3f45353e1a117bfc52712851420e0
RxDataSources-Texture: eac7a5454555235619bfa7936c2db117e5bda309
RxOptional: 9904e2219d59260c3c171273d475b2126de187e8
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RxDataSources-Texture is available through [CocoaPods](https://cocoapods.org). T
it, simply add the following line to your Podfile:

```ruby
pod 'RxDataSources-Texture', '~> 1.2.0'
pod 'RxDataSources-Texture', '~> 1.2.1'
```

## Author
Expand Down
2 changes: 1 addition & 1 deletion RxDataSources-Texture.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'RxDataSources-Texture'
s.version = '1.2.0'
s.version = '1.2.1'
s.summary = 'RxDataSources With Texture'
s.description = <<-DESC
This is a collection of reactive data sources for ASTableNode and ASCollectionNode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extension Reactive where Base: ASCollectionNode {
O: ObservableType>
(dataSource: DataSource)
-> (_ source: O)
-> Disposable where DataSource.Element == O.E {
-> Disposable where DataSource.Element == O.Element {
return { source in
return source.subscribeProxyDataSource(ofObject: self.base, dataSource: dataSource, retainDataSource: true) { [weak collectionNode = self.base] (_: RxASCollectionDataSourceProxy, event) -> Void in
guard let collectionNode = collectionNode else {
Expand Down
4 changes: 2 additions & 2 deletions RxDataSources-Texture/Classes/ASDelegateProxyType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import RxSwift
import RxCocoa

extension ObservableType {
func subscribeProxyDataSource<DelegateProxy: DelegateProxyType>(ofObject object: DelegateProxy.ParentObject, dataSource: DelegateProxy.Delegate, retainDataSource: Bool, binding: @escaping (DelegateProxy, Event<E>) -> Void)
func subscribeProxyDataSource<DelegateProxy: DelegateProxyType>(ofObject object: DelegateProxy.ParentObject, dataSource: DelegateProxy.Delegate, retainDataSource: Bool, binding: @escaping (DelegateProxy, Event<Element>) -> Void)
-> Disposable
where DelegateProxy.ParentObject: ASDisplayNode
, DelegateProxy.Delegate: AnyObject {
Expand All @@ -35,7 +35,7 @@ extension ObservableType {
// source can never end, otherwise it would release the subscriber, and deallocate the data source
.concat(Observable.never())
.takeUntil(object.rx.deallocated)
.subscribe { [weak object] (event: Event<E>) in
.subscribe { [weak object] (event: Event<Element>) in

if let object = object {
assert(proxy === DelegateProxy.currentDelegate(for: object), "Proxy changed from the time it was first set.\nOriginal: \(proxy)\nExisting: \(String(describing: DelegateProxy.currentDelegate(for: object)))")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extension Reactive where Base: ASTableNode {
(dataSource: DataSource)
-> (_ source: O)
-> Disposable
where DataSource.Element == O.E {
where DataSource.Element == O.Element {
return { source in
// Strong reference is needed because data source is in use until result subscription is disposed
return source.subscribeProxyDataSource(ofObject: self.base, dataSource: dataSource as ASTableDataSource, retainDataSource: true) { [weak tableNode = self.base] (_: RxASTableDataSourceProxy, event) -> Void in
Expand Down

0 comments on commit 1cb6770

Please sign in to comment.