diff --git a/.spm.pods/packages/.umbrella/Package.swift b/.spm.pods/packages/.umbrella/Package.swift new file mode 100644 index 0000000..da23206 --- /dev/null +++ b/.spm.pods/packages/.umbrella/Package.swift @@ -0,0 +1,9 @@ +// swift-tools-version:5.7 +import PackageDescription + +let package = Package( + name: "_umbrella_", + dependencies: [ + + ] +) diff --git a/Example/ViewController.swift b/Example/ViewController.swift index 07b2490..e739a5d 100644 --- a/Example/ViewController.swift +++ b/Example/ViewController.swift @@ -78,7 +78,7 @@ class ViewController: UIViewController { let dataSource = RxASTableAnimatedDataSource(configureCell: configureCell, titleForHeaderInSection: titleForHeaderInSection) Observable - .interval(2.0, scheduler: MainScheduler.instance) + .interval(.seconds(2), scheduler: MainScheduler.instance) .map { _ in var sectionIndex = Set() var section = [NumberSection]() diff --git a/Podfile b/Podfile index f6ef355..97f38e3 100644 --- a/Podfile +++ b/Podfile @@ -1,13 +1,26 @@ # Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '13.0' target 'Example' do # Comment the next line if you're not using Swift and don't want to use dynamic frameworks use_frameworks! - pod 'Texture' - pod 'RxSwift' - pod 'RxCocoa' - pod 'Differentiator' + pod 'Texture', '~> 3.0' + pod 'RxSwift', '~> 6.0' + pod 'RxCocoa', '~> 6.0' + pod 'Differentiator', '~> 5.0' end + +post_install do |pod_installer| + pod_installer.pods_project.targets.each do |t| + if t.respond_to?(:product_type) and t.product_type == "com.apple.product-type.bundle" + t.build_configurations.each do |config| + config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO' + end + end + t.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + end +end diff --git a/Podfile.lock b/Podfile.lock index 307c389..23a3609 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,46 +1,74 @@ PODS: - - Differentiator (3.0.2) - - PINCache (3.0.1-beta.5): - - PINCache/Arc-exception-safe (= 3.0.1-beta.5) - - PINCache/Core (= 3.0.1-beta.5) - - PINCache/Arc-exception-safe (3.0.1-beta.5): + - Differentiator (5.0.0) + - PINCache (3.0.4): + - PINCache/Arc-exception-safe (= 3.0.4) + - PINCache/Core (= 3.0.4) + - PINCache/Arc-exception-safe (3.0.4): - PINCache/Core - - PINCache/Core (3.0.1-beta.5): - - PINOperation (= 1.0.3) - - PINOperation (1.0.3) - - PINRemoteImage/Core (3.0.0-beta.12): + - PINCache/Core (3.0.4): + - PINOperation (~> 1.2.3) + - PINOperation (1.2.3) + - PINRemoteImage/Core (3.0.3): - PINOperation - - PINRemoteImage/iOS (3.0.0-beta.12): + - PINRemoteImage/iOS (3.0.3): - PINRemoteImage/Core - - PINRemoteImage/PINCache (3.0.0-beta.12): - - PINCache (= 3.0.1-beta.5) + - PINRemoteImage/PINCache (3.0.3): + - PINCache (~> 3.0.3) - PINRemoteImage/Core - - RxCocoa (4.0.0): - - RxSwift (~> 4.0) - - RxSwift (4.0.0) - - Texture (2.5.1): - - Texture/PINRemoteImage (= 2.5.1) - - Texture/Core (2.5.1) - - Texture/PINRemoteImage (2.5.1): - - PINRemoteImage/iOS (= 3.0.0-beta.12) + - RxCocoa (6.9.0): + - RxRelay (= 6.9.0) + - RxSwift (= 6.9.0) + - RxRelay (6.9.0): + - RxSwift (= 6.9.0) + - RxSwift (6.9.0) + - Texture (3.1.0): + - Texture/AssetsLibrary (= 3.1.0) + - Texture/Core (= 3.1.0) + - Texture/MapKit (= 3.1.0) + - Texture/Photos (= 3.1.0) + - Texture/PINRemoteImage (= 3.1.0) + - Texture/Video (= 3.1.0) + - Texture/AssetsLibrary (3.1.0): + - Texture/Core + - Texture/Core (3.1.0) + - Texture/MapKit (3.1.0): + - Texture/Core + - Texture/Photos (3.1.0): + - Texture/Core + - Texture/PINRemoteImage (3.1.0): + - PINRemoteImage/iOS (~> 3.0.0) - PINRemoteImage/PINCache - Texture/Core + - Texture/Video (3.1.0): + - Texture/Core DEPENDENCIES: - - Differentiator - - RxCocoa - - RxSwift - - Texture + - Differentiator (~> 5.0) + - RxCocoa (~> 6.0) + - RxSwift (~> 6.0) + - Texture (~> 3.0) + +SPEC REPOS: + trunk: + - Differentiator + - PINCache + - PINOperation + - PINRemoteImage + - RxCocoa + - RxRelay + - RxSwift + - Texture SPEC CHECKSUMS: - Differentiator: a87be69eba49ec4ab460c7671143ee3a9eececfd - PINCache: 98e7b1ef782824ad231ade51987c218b758c30d8 - PINOperation: ac23db44796d4a564ecf9b5ea7163510f579b71d - PINRemoteImage: 0cefe720c2612960bd360710efbd6c73a1991d5f - RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e - RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334 - Texture: c3f06e344aa091667b7a56002e525cde674d021a + Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d + PINCache: d9a87a0ff397acffe9e2f0db972ac14680441158 + PINOperation: fb563bcc9c32c26d6c78aaff967d405aa2ee74a7 + PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 + RxCocoa: ac16414696ae706516be3e1ab00fcce5bdc9be8a + RxRelay: 6b0c930e5cef57d5fe2032571e5e65b78e3cbdb1 + RxSwift: 31649ace6aceeb422e16ff71c60804f9c3281ed9 + Texture: 2e8ab2519452515f7f5a520f5a8f7e0a413abfa3 -PODFILE CHECKSUM: df58f9cead49c76984203f4eab4ded96071c8990 +PODFILE CHECKSUM: dc5305793a55e4c9fa3f639b5a699c7c567de9f5 -COCOAPODS: 1.3.1 +COCOAPODS: 1.15.2 diff --git a/RxASDataSources.podspec b/RxASDataSources.podspec index 225b308..d347f1e 100644 --- a/RxASDataSources.podspec +++ b/RxASDataSources.podspec @@ -15,9 +15,9 @@ Pod::Spec.new do |s| s.source_files = "Sources/**/*.swift" s.framework = "Foundation" - s.dependency 'RxSwift', '~> 5.1' - s.dependency 'RxCocoa', '~> 5.1' - s.dependency 'Differentiator', '~> 4.0' + s.dependency 'RxSwift', '~> 6.0' + s.dependency 'RxCocoa', '~> 6.0' + s.dependency 'Differentiator', '~> 5.0' s.dependency 'Texture', '~> 3.0' end diff --git a/RxASDataSources.xcodeproj/project.pbxproj b/RxASDataSources.xcodeproj/project.pbxproj index fcca701..2c25fde 100644 --- a/RxASDataSources.xcodeproj/project.pbxproj +++ b/RxASDataSources.xcodeproj/project.pbxproj @@ -331,7 +331,6 @@ 57826BA41F29491800FB0414 /* Frameworks */, 57826BA51F29491800FB0414 /* Resources */, F287AD5C5D01FE15DAF7988F /* [CP] Embed Pods Frameworks */, - B17F3E75B8B24C7AC6478D18 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -368,6 +367,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -403,21 +403,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - B17F3E75B8B24C7AC6478D18 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; DAF660CD4A78B5AD6D0C8067 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -442,12 +427,13 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework", "${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework", "${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework", "${BUILT_PRODUCTS_DIR}/PINRemoteImage/PINRemoteImage.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Texture/AsyncDisplayKit.framework", ); @@ -458,12 +444,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINRemoteImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AsyncDisplayKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -674,7 +661,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dangthaison91.RxASDataSources; PRODUCT_NAME = RxASDataSources; @@ -693,7 +680,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dangthaison91.RxASDataSources; PRODUCT_NAME = RxASDataSources; @@ -716,7 +703,7 @@ "$(PROJECT_DIR)/Carthage/Checkouts/RxDataSources/build/Debug-iphoneos", ); INFOPLIST_FILE = Example/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dangthaison91.Example; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -739,7 +726,7 @@ "$(PROJECT_DIR)/Carthage/Checkouts/RxDataSources/build/Debug-iphoneos", ); INFOPLIST_FILE = Example/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.dangthaison91.Example; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/RxASDataSources.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RxASDataSources.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/RxASDataSources.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionNode+rx.swift b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionNode+rx.swift index 9025b89..403778c 100644 --- a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionNode+rx.swift +++ b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionNode+rx.swift @@ -13,7 +13,7 @@ import RxCocoa public extension Reactive where Base: ASCollectionNode { func items(dataSource: DataSource) -> (_ source: O) - -> Disposable where DataSource.Element == O.E { + -> Disposable where DataSource.Element == O.Element { return { source in diff --git a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift index 74b98d2..e49deb4 100644 --- a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift +++ b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift @@ -239,7 +239,8 @@ open class ASCollectionSectionedDataSource: NSObject, ASCol return cell } - open func collectionNode(_ collectionNode: ASCollectionNode, canMoveItemAt indexPath: IndexPath) -> Bool { + open func collectionNode(_ collectionNode: ASCollectionNode, canMoveItemWith node: ASCellNode) -> Bool { + guard let indexPath = node.indexPath else { return false } return canMoveItemAtIndexPath(self, indexPath) } diff --git a/Sources/DataSources/ASTableNode+Rx/ASTableNode+Rx.swift b/Sources/DataSources/ASTableNode+Rx/ASTableNode+Rx.swift index a88d3ec..ec458da 100644 --- a/Sources/DataSources/ASTableNode+Rx/ASTableNode+Rx.swift +++ b/Sources/DataSources/ASTableNode+Rx/ASTableNode+Rx.swift @@ -14,7 +14,7 @@ import RxCocoa public extension Reactive where Base: ASTableNode { func items(dataSource: DataSource) -> (_ source: O) - -> Disposable where DataSource.Element == O.E { + -> Disposable where DataSource.Element == O.Element { return { source in diff --git a/Sources/DataSources/RxHelper/ASDelegateProxy.swift b/Sources/DataSources/RxHelper/ASDelegateProxy.swift index f87bae6..d2bc04d 100644 --- a/Sources/DataSources/RxHelper/ASDelegateProxy.swift +++ b/Sources/DataSources/RxHelper/ASDelegateProxy.swift @@ -12,7 +12,7 @@ import RxSwift import RxCocoa extension ObservableType { - func subscribeProxyDataSource(ofObject object: DelegateProxy.ParentObject, dataSource: DelegateProxy.Delegate, retainDataSource: Bool, binding: @escaping (DelegateProxy, Event) -> Void) + func subscribeProxyDataSource(ofObject object: DelegateProxy.ParentObject, dataSource: DelegateProxy.Delegate, retainDataSource: Bool, binding: @escaping (DelegateProxy, Event) -> Void) -> Disposable where DelegateProxy.ParentObject: ASDisplayNode { @@ -36,7 +36,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: RxSwift.Event) in + .subscribe { [weak object] (event: RxSwift.Event) in if let object = object { // TODO: Enable assert again to prevent Proxy changed