Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "ReactiveX/RxSwift" ~> 3.4
github "RxSwiftCommunity/RxDataSources" "1.0.4"

github "RxSwiftCommunity/RxDataSources"
github "texturegroup/texture"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
github "ReactiveX/RxSwift" "3.6.1"
github "RxSwiftCommunity/RxDataSources" "1.0.4"
github "RxSwiftCommunity/RxDataSources" "2.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.3.4"
github "texturegroup/texture" "2.4"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxDataSources
Submodule RxDataSources updated 375 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/texture
Submodule texture updated 158 files
2 changes: 1 addition & 1 deletion Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UIKit
import AsyncDisplayKit
import RxSwift
import RxCocoa
import RxDataSources
import Differentiator

struct NumberSection {
var header: String
Expand Down
10 changes: 1 addition & 9 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ target 'Example' do
pod 'Texture'
pod 'RxSwift'
pod 'RxCocoa'
pod 'RxDataSources'

end

target 'RxTextureDataSources-iOS' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

# Pods for RxTextureDataSources-iOS
pod 'Differentiator'

end
22 changes: 10 additions & 12 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PODS:
- Differentiator (2.0.2)
- PINCache (3.0.1-beta.5):
- PINCache/Arc-exception-safe (= 3.0.1-beta.5)
- PINCache/Core (= 3.0.1-beta.5)
Expand All @@ -16,33 +17,30 @@ PODS:
- PINRemoteImage/Core
- RxCocoa (3.6.1):
- RxSwift (~> 3.6)
- RxDataSources (1.0.4):
- RxCocoa (~> 3.0)
- RxSwift (~> 3.0)
- RxSwift (3.6.1)
- Texture (2.3.4):
- Texture/PINRemoteImage (= 2.3.4)
- Texture/Core (2.3.4)
- Texture/PINRemoteImage (2.3.4):
- Texture (2.4):
- Texture/PINRemoteImage (= 2.4)
- Texture/Core (2.4)
- Texture/PINRemoteImage (2.4):
- PINRemoteImage/iOS (= 3.0.0-beta.11)
- PINRemoteImage/PINCache
- Texture/Core

DEPENDENCIES:
- Differentiator
- RxCocoa
- RxDataSources
- RxSwift
- Texture

SPEC CHECKSUMS:
Differentiator: caa9b3957981a2ac8e6b2eac8a676af461caa604
PINCache: 98e7b1ef782824ad231ade51987c218b758c30d8
PINOperation: ac23db44796d4a564ecf9b5ea7163510f579b71d
PINRemoteImage: d71988f11914a050d6d4cf51efc4ad1de8c0a9d8
RxCocoa: 84a08739ab186248c7f31ce4ee92d6f8a947d690
RxDataSources: b3389acc5fe2eefb8fcd81a2b76a876ad08bc82a
RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
Texture: 8cf0872fe33328c20d7e6c1fcbf1f23a82162f2f
Texture: a5526314780eab35f642d956627f09316b9514e8

PODFILE CHECKSUM: c6e55f516b1e6974577295ead732c9596e95383a
PODFILE CHECKSUM: df58f9cead49c76984203f4eab4ded96071c8990

COCOAPODS: 1.2.1
COCOAPODS: 1.3.0
20 changes: 10 additions & 10 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## RxTextureDataSources
## RxASDataSources

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

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

Expand All @@ -22,10 +22,10 @@

### CocoaPods

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

```ruby
pod 'RxTextureDataSources', '~> 0.1'
pod 'RxASDataSources', '~> 0.1'
```

Then, run the following command:
Expand All @@ -36,14 +36,14 @@ $ pod install

### Carthage

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

```ogdl
github "dangthaison91/RxTextureDataSources" ~> 0.1
github "dangthaison91/RxASDataSources" ~> 0.1
```

## Usage

## License

RxTextureDataSources is released under the MIT license. See [LICENSE](https://github.com/RxSwiftCommunity/RxTextureDataSources/blob/master/LICENSE) for details.
RxASDataSources is released under the MIT license. See [LICENSE](https://github.com/RxSwiftCommunity/RxTextureDataSources/blob/master/LICENSE) for details.
12 changes: 6 additions & 6 deletions RxTextureDataSources.podspec → RxASDataSources.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|
s.name = 'RxTextureDataSources'
s.version = '0.1.4'
s.name = 'RxASDataSources'
s.version = '0.2'
s.license = { :type => "MIT", :file => "LICENSE" }
s.summary = 'RxDataSource for AsyncDisplayKit/Texture view containers'
s.homepage = 'https://github.com/dangthaison91/RxTextureDataSources'
s.summary = 'RxDataSources for AsyncDisplayKit/Texture ASTableNode/ASCollectionNode'
s.homepage = 'https://github.com/dangthaison91/RxASDataSources'
s.social_media_url = 'https://twitter.com/dangthaison91'
s.authors = { "Dang Thai Son" => "dangthaison.91@gmail.com" }
s.source = { :git => "https://github.com/dangthaison91/RxTextureDataSources.git", :tag => s.version.to_s }
s.source = { :git => "https://github.com/dangthaison91/RxASDataSources.git", :tag => s.version.to_s }
s.platforms = { :ios => "8.0" }
s.requires_arc = true

s.source_files = "Sources/**/*.swift"
s.framework = "Foundation"
s.dependency 'RxSwift', '~> 3.4'
s.dependency 'RxCocoa', '~> 3.4'
s.dependency 'RxDataSources', '~> 1.0'
s.dependency 'Differentiator', '~> 2.0'
s.dependency 'Texture', '~> 2.0'

end
Loading