Skip to content

Commit 96e4269

Browse files
committed
Use Differentiator
1 parent 946c18e commit 96e4269

14 files changed

+52
-23
lines changed

Cartfile

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

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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" "d598b9a12b77971e14d3e6aaee41418ac842445d"
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"

Carthage/Checkouts/RxDataSources

Submodule RxDataSources updated 370 files

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target 'Example' do
88
pod 'Texture'
99
pod 'RxSwift'
1010
pod 'RxCocoa'
11-
pod 'RxDataSources'
11+
pod 'Differentiator', :git =>'https://github.com/RxSwiftCommunity/RxDataSources.git', :branch => 'master'
1212

1313
end
1414

Podfile.lock

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
PODS:
2+
- Differentiator (2.0.0)
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,9 +17,6 @@ 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)
2321
- Texture (2.3.4):
2422
- Texture/PINRemoteImage (= 2.3.4)
@@ -29,20 +27,30 @@ PODS:
2927
- Texture/Core
3028

3129
DEPENDENCIES:
30+
- Differentiator (from `https://github.com/RxSwiftCommunity/RxDataSources.git`, branch `master`)
3231
- RxCocoa
33-
- RxDataSources
3432
- RxSwift
3533
- Texture
3634

35+
EXTERNAL SOURCES:
36+
Differentiator:
37+
:branch: master
38+
:git: https://github.com/RxSwiftCommunity/RxDataSources.git
39+
40+
CHECKOUT OPTIONS:
41+
Differentiator:
42+
:commit: d598b9a12b77971e14d3e6aaee41418ac842445d
43+
:git: https://github.com/RxSwiftCommunity/RxDataSources.git
44+
3745
SPEC CHECKSUMS:
46+
Differentiator: 43cd6e202e3ac1ca60b4cc83364584c76e9d2d7f
3847
PINCache: 98e7b1ef782824ad231ade51987c218b758c30d8
3948
PINOperation: ac23db44796d4a564ecf9b5ea7163510f579b71d
4049
PINRemoteImage: d71988f11914a050d6d4cf51efc4ad1de8c0a9d8
4150
RxCocoa: 84a08739ab186248c7f31ce4ee92d6f8a947d690
42-
RxDataSources: b3389acc5fe2eefb8fcd81a2b76a876ad08bc82a
4351
RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
4452
Texture: 8cf0872fe33328c20d7e6c1fcbf1f23a82162f2f
4553

46-
PODFILE CHECKSUM: c6e55f516b1e6974577295ead732c9596e95383a
54+
PODFILE CHECKSUM: 9a8f14c1e9a4c9555d90e8174ad8f9ad8f024f6a
4755

48-
COCOAPODS: 1.2.1
56+
COCOAPODS: 1.3.0

RxTextureDataSources.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.framework = "Foundation"
1515
s.dependency 'RxSwift', '~> 3.4'
1616
s.dependency 'RxCocoa', '~> 3.4'
17-
s.dependency 'RxDataSources', '~> 1.0'
17+
s.dependency 'Differentiator', '~> 2.0'
1818
s.dependency 'Texture', '~> 2.0'
1919

2020
end

RxTextureDataSources.xcodeproj/project.pbxproj

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,16 @@
547547
files = (
548548
);
549549
inputPaths = (
550+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
551+
"${PODS_ROOT}/Manifest.lock",
550552
);
551553
name = "[CP] Check Pods Manifest.lock";
552554
outputPaths = (
555+
"$(DERIVED_FILE_DIR)/Pods-RxTextureDataSources-iOS-checkManifestLockResult.txt",
553556
);
554557
runOnlyForDeploymentPostprocessing = 0;
555558
shellPath = /bin/sh;
556-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
559+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
557560
showEnvVarsInLog = 0;
558561
};
559562
B17F3E75B8B24C7AC6478D18 /* [CP] Copy Pods Resources */ = {
@@ -577,13 +580,16 @@
577580
files = (
578581
);
579582
inputPaths = (
583+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
584+
"${PODS_ROOT}/Manifest.lock",
580585
);
581586
name = "[CP] Check Pods Manifest.lock";
582587
outputPaths = (
588+
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
583589
);
584590
runOnlyForDeploymentPostprocessing = 0;
585591
shellPath = /bin/sh;
586-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
592+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
587593
showEnvVarsInLog = 0;
588594
};
589595
F287AD5C5D01FE15DAF7988F /* [CP] Embed Pods Frameworks */ = {
@@ -592,9 +598,24 @@
592598
files = (
593599
);
594600
inputPaths = (
601+
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
602+
"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
603+
"${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework",
604+
"${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework",
605+
"${BUILT_PRODUCTS_DIR}/PINRemoteImage/PINRemoteImage.framework",
606+
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
607+
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
608+
"${BUILT_PRODUCTS_DIR}/Texture/AsyncDisplayKit.framework",
595609
);
596610
name = "[CP] Embed Pods Frameworks";
597611
outputPaths = (
612+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
613+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework",
614+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework",
615+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINRemoteImage.framework",
616+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
617+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
618+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AsyncDisplayKit.framework",
598619
);
599620
runOnlyForDeploymentPostprocessing = 0;
600621
shellPath = /bin/sh;
@@ -797,7 +818,7 @@
797818
DYLIB_INSTALL_NAME_BASE = "@rpath";
798819
INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info.plist";
799820
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
800-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
821+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
801822
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
802823
PRODUCT_BUNDLE_IDENTIFIER = me.dangthaison91.rxtexture.RxTextureDataSources;
803824
PRODUCT_NAME = RxTextureDataSources;
@@ -817,7 +838,7 @@
817838
DYLIB_INSTALL_NAME_BASE = "@rpath";
818839
INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info.plist";
819840
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
820-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
841+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
821842
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
822843
PRODUCT_BUNDLE_IDENTIFIER = me.dangthaison91.rxtexture.RxTextureDataSources;
823844
PRODUCT_NAME = RxTextureDataSources;

Sources/DataSources/ASCollectionNode+Rx/ASCollectionNode+SectionViewType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Foundation
1010
import UIKit
1111
import AsyncDisplayKit
12-
import RxDataSources
12+
import Differentiator
1313

1414
extension ASCollectionNode: SectionedViewType {
1515

Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010
import AsyncDisplayKit
1111
#if !RX_NO_MODULE
1212
import RxCocoa
13-
import RxDataSources
13+
import Differentiator
1414
#endif
1515

1616
open class _ASCollectionSectionedDataSource: NSObject, ASCollectionDataSource {

Sources/DataSources/ASCollectionNode+Rx/RxASCollectionAnimatedDataSource.swift

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

1515
open class RxASCollectionAnimatedDataSource<S: AnimatableSectionModelType>: ASCollectionSectionedDataSource<S>, RxASCollectionDataSourceType {
1616

0 commit comments

Comments
 (0)