Skip to content

Commit 4681b42

Browse files
Merge pull request #2 from dangthaison91/Differentiator
Replace RxDataSources by RxDataSources/Differentiator
2 parents a8b308f + 9db87b1 commit 4681b42

34 files changed

+196
-218
lines changed

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "ReactiveX/RxSwift" ~> 3.4
2-
github "RxSwiftCommunity/RxDataSources" "1.0.4"
1+
2+
github "RxSwiftCommunity/RxDataSources"
33
github "texturegroup/texture"

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
22
github "ReactiveX/RxSwift" "3.6.1"
3-
github "RxSwiftCommunity/RxDataSources" "1.0.4"
3+
github "RxSwiftCommunity/RxDataSources" "2.0.2"
44
github "pinterest/PINCache" "3.0.1-beta.5"
55
github "pinterest/PINOperation" "1.0.3"
66
github "pinterest/PINRemoteImage" "3.0.0-beta.11"
7-
github "texturegroup/texture" "2.3.4"
7+
github "texturegroup/texture" "2.4"

Carthage/Checkouts/RxDataSources

Submodule RxDataSources updated 375 files

Carthage/Checkouts/texture

Submodule texture updated 158 files

Example/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010
import AsyncDisplayKit
1111
import RxSwift
1212
import RxCocoa
13-
import RxDataSources
13+
import Differentiator
1414

1515
struct NumberSection {
1616
var header: String

Podfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ target 'Example' do
88
pod 'Texture'
99
pod 'RxSwift'
1010
pod 'RxCocoa'
11-
pod 'RxDataSources'
12-
13-
end
14-
15-
target 'RxTextureDataSources-iOS' do
16-
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
17-
use_frameworks!
18-
19-
# Pods for RxTextureDataSources-iOS
11+
pod 'Differentiator'
2012

2113
end

Podfile.lock

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
PODS:
2+
- Differentiator (2.0.2)
23
- PINCache (3.0.1-beta.5):
34
- PINCache/Arc-exception-safe (= 3.0.1-beta.5)
45
- PINCache/Core (= 3.0.1-beta.5)
@@ -16,33 +17,30 @@ PODS:
1617
- PINRemoteImage/Core
1718
- RxCocoa (3.6.1):
1819
- RxSwift (~> 3.6)
19-
- RxDataSources (1.0.4):
20-
- RxCocoa (~> 3.0)
21-
- RxSwift (~> 3.0)
2220
- RxSwift (3.6.1)
23-
- Texture (2.3.4):
24-
- Texture/PINRemoteImage (= 2.3.4)
25-
- Texture/Core (2.3.4)
26-
- Texture/PINRemoteImage (2.3.4):
21+
- Texture (2.4):
22+
- Texture/PINRemoteImage (= 2.4)
23+
- Texture/Core (2.4)
24+
- Texture/PINRemoteImage (2.4):
2725
- PINRemoteImage/iOS (= 3.0.0-beta.11)
2826
- PINRemoteImage/PINCache
2927
- Texture/Core
3028

3129
DEPENDENCIES:
30+
- Differentiator
3231
- RxCocoa
33-
- RxDataSources
3432
- RxSwift
3533
- Texture
3634

3735
SPEC CHECKSUMS:
36+
Differentiator: caa9b3957981a2ac8e6b2eac8a676af461caa604
3837
PINCache: 98e7b1ef782824ad231ade51987c218b758c30d8
3938
PINOperation: ac23db44796d4a564ecf9b5ea7163510f579b71d
4039
PINRemoteImage: d71988f11914a050d6d4cf51efc4ad1de8c0a9d8
4140
RxCocoa: 84a08739ab186248c7f31ce4ee92d6f8a947d690
42-
RxDataSources: b3389acc5fe2eefb8fcd81a2b76a876ad08bc82a
4341
RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
44-
Texture: 8cf0872fe33328c20d7e6c1fcbf1f23a82162f2f
42+
Texture: a5526314780eab35f642d956627f09316b9514e8
4543

46-
PODFILE CHECKSUM: c6e55f516b1e6974577295ead732c9596e95383a
44+
PODFILE CHECKSUM: df58f9cead49c76984203f4eab4ded96071c8990
4745

48-
COCOAPODS: 1.2.1
46+
COCOAPODS: 1.3.0

Readme.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## RxTextureDataSources
1+
## RxASDataSources
22

3-
[![Platforms](https://img.shields.io/cocoapods/p/RxTextureDataSources.svg)](https://cocoapods.org/pods/RxTextureDataSources)
4-
[![License](https://img.shields.io/cocoapods/l/RxTextureDataSources.svg)](https://raw.githubusercontent.com/RxSwiftCommunity/RxTextureDataSources/master/LICENSE)
3+
[![Platforms](https://img.shields.io/cocoapods/p/RxASDataSources.svg)](https://cocoapods.org/pods/RxASDataSources)
4+
[![License](https://img.shields.io/cocoapods/l/RxASDataSources.svg)](https://raw.githubusercontent.com/dangthaison91/RxASDataSources/master/LICENSE)
55
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
6-
[![CocoaPods compatible](https://img.shields.io/cocoapods/v/RxTextureDataSources.svg)](https://cocoapods.org/pods/RxTextureDataSources)
7-
[![Travis](https://img.shields.io/travis/RxSwiftCommunity/RxTextureDataSources/master.svg)](https://travis-ci.org/RxSwiftCommunity/RxTextureDataSources/branches)
6+
[![CocoaPods compatible](https://img.shields.io/cocoapods/v/RxASDataSources.svg)](https://cocoapods.org/pods/RxASDataSources)
7+
[![Travis](https://img.shields.io/travis/dangthaison91/RxASDataSources/master.svg)](https://travis-ci.org/dangthaison91/RxASDataSources/branches)
88

99
[RxDataSources](https://github.com/RxSwiftCommunity/RxDataSources) for AsyncDisplayKit/Texture: ASTableNode & ASCollectionNode.
1010

@@ -22,10 +22,10 @@
2222

2323
### CocoaPods
2424

25-
To integrate RxTextureDataSources into your Xcode project using CocoaPods, specify it in your `Podfile`:
25+
To integrate RxASDataSources into your Xcode project using CocoaPods, specify it in your `Podfile`:
2626

2727
```ruby
28-
pod 'RxTextureDataSources', '~> 0.1'
28+
pod 'RxASDataSources', '~> 0.1'
2929
```
3030

3131
Then, run the following command:
@@ -36,14 +36,14 @@ $ pod install
3636

3737
### Carthage
3838

39-
To integrate RxTextureDataSources into your Xcode project using Carthage, specify it in your `Cartfile`:
39+
To integrate RxASDataSources into your Xcode project using Carthage, specify it in your `Cartfile`:
4040

4141
```ogdl
42-
github "dangthaison91/RxTextureDataSources" ~> 0.1
42+
github "dangthaison91/RxASDataSources" ~> 0.1
4343
```
4444

4545
## Usage
4646

4747
## License
4848

49-
RxTextureDataSources is released under the MIT license. See [LICENSE](https://github.com/RxSwiftCommunity/RxTextureDataSources/blob/master/LICENSE) for details.
49+
RxASDataSources is released under the MIT license. See [LICENSE](https://github.com/RxSwiftCommunity/RxTextureDataSources/blob/master/LICENSE) for details.

0 commit comments

Comments
 (0)