Skip to content

Commit

Permalink
Merge pull request #21 from OhKanghoon/feature/texture-3
Browse files Browse the repository at this point in the history
Let's Texture 3.0
  • Loading branch information
OhKanghoon authored Jul 17, 2020
2 parents ee5263a + 76ac4be commit 4b438bf
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 37 deletions.
4 changes: 2 additions & 2 deletions Example/GithubRepos/CategoryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import RxSwift
import RxCocoa
import RxOptional

final class CategoryViewController: ASViewController<ASTableNode> {
final class CategoryViewController: ASDKViewController<ASTableNode> {

enum Item: Int, CaseIterable {
case table
Expand All @@ -28,7 +28,7 @@ final class CategoryViewController: ASViewController<ASTableNode> {

// MARK: - Initialization

init() {
override init() {
super.init(node: ASTableNode())
node.delegate = self
node.dataSource = self
Expand Down
2 changes: 1 addition & 1 deletion Example/GithubRepos/RepoCollectionViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import RxSwift
import RxCocoa
import RxOptional

class RepoCollectionViewController: ASViewController<ASDisplayNode> {
class RepoCollectionViewController: ASDKViewController<ASDisplayNode> {

// MARK: - Properties

Expand Down
2 changes: 1 addition & 1 deletion Example/GithubRepos/RepoTableViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import RxSwift
import RxCocoa
import RxOptional

class RepoTableViewController: ASViewController<ASDisplayNode> {
class RepoTableViewController: ASDKViewController<ASDisplayNode> {

// MARK: - Properties

Expand Down
1 change: 0 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ let package = Package(
.testTarget(name: "RxDataSources-TextureTests", dependencies: ["RxDataSources-Texture"]),
]
)

2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ inhibit_all_warnings!

target 'RxDataSources-Texture' do
use_frameworks!
pod 'Texture', '~> 2.8'
pod 'Texture', '~> 3.0'

target 'RxDataSources-TextureTests' do
end
Expand Down
60 changes: 30 additions & 30 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
PODS:
- PINCache (3.0.1-beta.6):
- PINCache/Arc-exception-safe (= 3.0.1-beta.6)
- PINCache/Core (= 3.0.1-beta.6)
- PINCache/Arc-exception-safe (3.0.1-beta.6):
- PINCache (3.0.1-beta.8):
- PINCache/Arc-exception-safe (= 3.0.1-beta.8)
- PINCache/Core (= 3.0.1-beta.8)
- PINCache/Arc-exception-safe (3.0.1-beta.8):
- PINCache/Core
- PINCache/Core (3.0.1-beta.6):
- PINOperation (~> 1.1.0)
- PINCache/Core (3.0.1-beta.8):
- PINOperation (~> 1.1.1)
- PINOperation (1.1.2)
- PINRemoteImage/Core (3.0.0-beta.13):
- PINRemoteImage/Core (3.0.0):
- PINOperation
- PINRemoteImage/iOS (3.0.0-beta.13):
- PINRemoteImage/iOS (3.0.0):
- PINRemoteImage/Core
- PINRemoteImage/PINCache (3.0.0-beta.13):
- PINCache (= 3.0.1-beta.6)
- PINRemoteImage/PINCache (3.0.0):
- PINCache (= 3.0.1-beta.8)
- PINRemoteImage/Core
- Texture (2.8.1):
- Texture/AssetsLibrary (= 2.8.1)
- Texture/Core (= 2.8.1)
- Texture/MapKit (= 2.8.1)
- Texture/Photos (= 2.8.1)
- Texture/PINRemoteImage (= 2.8.1)
- Texture/Video (= 2.8.1)
- Texture/AssetsLibrary (2.8.1):
- Texture (3.0.0):
- Texture/AssetsLibrary (= 3.0.0)
- Texture/Core (= 3.0.0)
- Texture/MapKit (= 3.0.0)
- Texture/Photos (= 3.0.0)
- Texture/PINRemoteImage (= 3.0.0)
- Texture/Video (= 3.0.0)
- Texture/AssetsLibrary (3.0.0):
- Texture/Core
- Texture/Core (2.8.1)
- Texture/MapKit (2.8.1):
- Texture/Core (3.0.0)
- Texture/MapKit (3.0.0):
- Texture/Core
- Texture/Photos (2.8.1):
- Texture/Photos (3.0.0):
- Texture/Core
- Texture/PINRemoteImage (2.8.1):
- PINRemoteImage/iOS (= 3.0.0-beta.13)
- Texture/PINRemoteImage (3.0.0):
- PINRemoteImage/iOS (~> 3.0.0)
- PINRemoteImage/PINCache
- Texture/Core
- Texture/Video (2.8.1):
- Texture/Video (3.0.0):
- Texture/Core

DEPENDENCIES:
- Texture (~> 2.8)
- Texture (~> 3.0)

SPEC REPOS:
trunk:
Expand All @@ -46,11 +46,11 @@ SPEC REPOS:
- Texture

SPEC CHECKSUMS:
PINCache: d195fdba255283f7e9900a55e3cced377f431f9b
PINCache: 534fd41d358d828dfdf227a0d327f3673a65e20b
PINOperation: 24b774353ca248fcf87d67b2d61eef42087c125a
PINRemoteImage: d6d51c5d2adda55f1ce30c96e850b6c4ebd2856a
Texture: 8ecf6984065a1e54f06bf97b349ecca28582acd7
PINRemoteImage: e2b89e19fb6e77ffc099f9d9f3b3fe1745e3f9f9
Texture: 2f109e937850d94d1d07232041c9c7313ccddb81

PODFILE CHECKSUM: 7f57aa32c20273eba5149361740682e764a707c0
PODFILE CHECKSUM: 84c07afdd654394e2a5117c18b492819e1cc99d0

COCOAPODS: 1.8.4
COCOAPODS: 1.9.3
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.8'
s.version = '1.3.0'
s.summary = 'RxDataSources With Texture'
s.description = <<-DESC
This is a collection of reactive data sources for ASTableNode and ASCollectionNode
Expand Down

0 comments on commit 4b438bf

Please sign in to comment.