diff --git a/Cartfile b/Cartfile index 3c3d355..005aebe 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,4 @@ github "RxSwiftCommunity/RxDataSources" github "texturegroup/texture" -github "pinterest/PINCache" ~> 3.0.1 +github "pinterest/PINCache" ~> 3.0.1-beta.7 +github "ReactiveX/RxSwift" ~> 5.0.0 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index da0ffd0..13d8f08 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,8 +1,7 @@ -git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1" -github "ReactiveX/RxSwift" "4.1.1" -github "RxSwiftCommunity/RxDataSources" "3.0.2" -github "pinterest/PINCache" "3.0.1-beta.5" -github "pinterest/PINOperation" "1.0.3" -github "pinterest/PINRemoteImage" "3.0.0-beta.12" -github "texturegroup/texture" "2.5.1" -github "pinterest/PINCache" "3.0.1-beta.6" +git "https://chromium.googlesource.com/webm/libwebp" "v0.6.0" +github "ReactiveX/RxSwift" "5.0.1" +github "RxSwiftCommunity/RxDataSources" "4.0.1" +github "pinterest/PINCache" "3.0.1-beta.8" +github "pinterest/PINOperation" "1.1.2" +github "pinterest/PINRemoteImage" "3.0.0-beta.13" +github "texturegroup/texture" "2.8.1" diff --git a/Carthage/Checkouts/PINCache b/Carthage/Checkouts/PINCache index e4c5739..51343ca 160000 --- a/Carthage/Checkouts/PINCache +++ b/Carthage/Checkouts/PINCache @@ -1 +1 @@ -Subproject commit e4c57392612019fe536490d76c0fcae5d323d0d9 +Subproject commit 51343ca955534559ca7514195c1bd1913f2cca9e diff --git a/Carthage/Checkouts/PINOperation b/Carthage/Checkouts/PINOperation index 091f733..47332a9 160000 --- a/Carthage/Checkouts/PINOperation +++ b/Carthage/Checkouts/PINOperation @@ -1 +1 @@ -Subproject commit 091f733b4b82f9cd5b6f0d912ead18a600c29b39 +Subproject commit 47332a9a8f21426f3345bb39b5d3f4fe3efd1879 diff --git a/Carthage/Checkouts/PINRemoteImage b/Carthage/Checkouts/PINRemoteImage index bfc5311..0e24a23 160000 --- a/Carthage/Checkouts/PINRemoteImage +++ b/Carthage/Checkouts/PINRemoteImage @@ -1 +1 @@ -Subproject commit bfc53115d20111febd527e2de15089333944aac7 +Subproject commit 0e24a23f9ea91a13de59619b197c4118c08b3380 diff --git a/Carthage/Checkouts/RxDataSources b/Carthage/Checkouts/RxDataSources index ddfc9a1..a18cee0 160000 --- a/Carthage/Checkouts/RxDataSources +++ b/Carthage/Checkouts/RxDataSources @@ -1 +1 @@ -Subproject commit ddfc9a1fdba650984f3a72b5b318e55fcfeccbae +Subproject commit a18cee01c9ee55f04d0c7eb15c77a96c3648c88e diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift index e479d00..b3e888b 160000 --- a/Carthage/Checkouts/RxSwift +++ b/Carthage/Checkouts/RxSwift @@ -1 +1 @@ -Subproject commit e479d0029db0575e03e3c092e1c9724b9410eab7 +Subproject commit b3e888b4972d9bc76495dd74d30a8c7fad4b9395 diff --git a/Carthage/Checkouts/libwebp b/Carthage/Checkouts/libwebp index 3d97bb7..50d1a84 160000 --- a/Carthage/Checkouts/libwebp +++ b/Carthage/Checkouts/libwebp @@ -1 +1 @@ -Subproject commit 3d97bb75144147e47db278ec76e5e70c6b2243db +Subproject commit 50d1a848bc56554af8413cfe681f94286a6371b3 diff --git a/Carthage/Checkouts/texture b/Carthage/Checkouts/texture index b2c82d7..1ba3c4a 160000 --- a/Carthage/Checkouts/texture +++ b/Carthage/Checkouts/texture @@ -1 +1 @@ -Subproject commit b2c82d7cff4ec5a193671f71fac90f9518482ea8 +Subproject commit 1ba3c4a74f0654ed917e8b74c0ecf7088c98291f diff --git a/RxASDataSources.podspec b/RxASDataSources.podspec index c8f4624..20f96c3 100644 --- a/RxASDataSources.podspec +++ b/RxASDataSources.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxASDataSources' - s.version = '0.3.3' + s.version = '0.3.4' s.license = { :type => "MIT", :file => "LICENSE" } s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode' s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources' @@ -10,13 +10,13 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.requires_arc = true - s.swift_version = '4.2' + s.swift_version = '5.0' s.source_files = "Sources/**/*.swift" s.framework = "Foundation" - s.dependency 'RxSwift', '~> 4.0' - s.dependency 'RxCocoa', '~> 4.0' - s.dependency 'Differentiator', '~> 3.0' - s.dependency 'Texture', '~> 2.5' + s.dependency 'RxSwift', '~> 5.0.0' + s.dependency 'RxCocoa', '~> 5.0.0' + s.dependency 'Differentiator', '~> 4.0' + s.dependency 'Texture', '~> 2.8.1' end diff --git a/RxASDataSources.xcodeproj/project.pbxproj b/RxASDataSources.xcodeproj/project.pbxproj index 4546f0a..fcca701 100644 --- a/RxASDataSources.xcodeproj/project.pbxproj +++ b/RxASDataSources.xcodeproj/project.pbxproj @@ -68,31 +68,6 @@ 3549BB211DA389CD00C63030 /* RxASDataSources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxASDataSources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3549BB581DA38A8800C63030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3549BB8A1DA38C0A00C63030 /* RxTextureDataSourcesSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextureDataSourcesSpec.swift; sourceTree = ""; }; - 35CD64E81E60192300AF060B /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; - 35CD64EA1E60192300AF060B /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - 35CD64EB1E60192300AF060B /* Profile.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Profile.xcconfig; sourceTree = ""; }; - 35CD64EC1E60192300AF060B /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 35CD64ED1E60192300AF060B /* Test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Test.xcconfig; sourceTree = ""; }; - 35CD64EF1E60192300AF060B /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = ""; }; - 35CD64F01E60192300AF060B /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = ""; }; - 35CD64F11E60192300AF060B /* StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibrary.xcconfig; sourceTree = ""; }; - 35CD65041E60192300AF060B /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = ""; }; - 35CD65051E60192300AF060B /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = ""; }; - 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = ""; }; - 35CD65071E60192300AF060B /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = ""; }; - 35CD65091E60192300AF060B /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = ""; }; - 35CD650A1E60192300AF060B /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = ""; }; - 35CD650B1E60192300AF060B /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = ""; }; - 35CD650C1E60192300AF060B /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = ""; }; - 35CD650D1E60192300AF060B /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = ""; }; - 35CD65101E60192300AF060B /* tvOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Application.xcconfig"; sourceTree = ""; }; - 35CD65111E60192300AF060B /* tvOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Base.xcconfig"; sourceTree = ""; }; - 35CD65121E60192300AF060B /* tvOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Framework.xcconfig"; sourceTree = ""; }; - 35CD65131E60192300AF060B /* tvOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-StaticLibrary.xcconfig"; sourceTree = ""; }; - 35CD65151E60192300AF060B /* watchOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Application.xcconfig"; sourceTree = ""; }; - 35CD65161E60192300AF060B /* watchOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Base.xcconfig"; sourceTree = ""; }; - 35CD65171E60192300AF060B /* watchOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Framework.xcconfig"; sourceTree = ""; }; - 35CD65181E60192300AF060B /* watchOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-StaticLibrary.xcconfig"; sourceTree = ""; }; 497271B10CB7AAE70BBDEAF0 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 574265681F6424BE0059BD8F /* Differentiator.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Differentiator.framework; path = "../../../../Users/sondt/Library/Developer/Xcode/DerivedData/RxTextureDataSources-hjacuybyhkyzareukzfcxgvmvvmv/Build/Products/Debug-iphonesimulator/Differentiator.framework"; sourceTree = ""; }; 57826B9F1F29477000FB0414 /* RxASCollectionReloadDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxASCollectionReloadDataSource.swift; sourceTree = ""; }; @@ -105,10 +80,6 @@ 57826BB31F29491800FB0414 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 57826BB51F29491800FB0414 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 57826BB91F2949D900FB0414 /* ASTableNode+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ASTableNode+Rx.swift"; sourceTree = ""; }; - 57826BD41F29505000FB0414 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxCocoa.framework"; sourceTree = ""; }; - 57826BD61F29505800FB0414 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxSwift.framework"; sourceTree = ""; }; - 57826BD81F29506000FB0414 /* RxDataSources.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxDataSources.framework; path = "Carthage/Checkouts/RxDataSources/build/Debug-iphoneos/RxDataSources.framework"; sourceTree = ""; }; - 57826BDC1F29509700FB0414 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxCocoa.framework"; sourceTree = ""; }; 57A64FFD1F1BF28D005C7A79 /* SectionedNodeType+BatchUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SectionedNodeType+BatchUpdate.swift"; sourceTree = ""; }; 57A650201F1BF309005C7A79 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 57A650211F1BF309005C7A79 /* RxASDataSources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RxASDataSources.h; sourceTree = ""; }; @@ -211,10 +182,6 @@ isa = PBXGroup; children = ( 574265681F6424BE0059BD8F /* Differentiator.framework */, - 57826BDC1F29509700FB0414 /* RxCocoa.framework */, - 57826BD81F29506000FB0414 /* RxDataSources.framework */, - 57826BD61F29505800FB0414 /* RxSwift.framework */, - 57826BD41F29505000FB0414 /* RxCocoa.framework */, 57E563091F28FECF002E825B /* RxDataSources.framework */, 57E563071F28FEC4002E825B /* RxCocoa.framework */, 57E563051F28FEBD002E825B /* RxSwift.framework */, @@ -228,100 +195,10 @@ 35CA2AD51E12933000147290 /* Configuration */ = { isa = PBXGroup; children = ( - 35CD64E51E60192300AF060B /* xcconfigs */, ); path = Configuration; sourceTree = ""; }; - 35CD64E51E60192300AF060B /* xcconfigs */ = { - isa = PBXGroup; - children = ( - 35CD64E71E60192300AF060B /* Base */, - 35CD65031E60192300AF060B /* iOS */, - 35CD65081E60192300AF060B /* Mac OS X */, - 35CD650F1E60192300AF060B /* tvOS */, - 35CD65141E60192300AF060B /* watchOS */, - ); - name = xcconfigs; - path = Carthage/Checkouts/xcconfigs; - sourceTree = SOURCE_ROOT; - }; - 35CD64E71E60192300AF060B /* Base */ = { - isa = PBXGroup; - children = ( - 35CD64E81E60192300AF060B /* Common.xcconfig */, - 35CD64E91E60192300AF060B /* Configurations */, - 35CD64EE1E60192300AF060B /* Targets */, - ); - path = Base; - sourceTree = ""; - }; - 35CD64E91E60192300AF060B /* Configurations */ = { - isa = PBXGroup; - children = ( - 35CD64EA1E60192300AF060B /* Debug.xcconfig */, - 35CD64EB1E60192300AF060B /* Profile.xcconfig */, - 35CD64EC1E60192300AF060B /* Release.xcconfig */, - 35CD64ED1E60192300AF060B /* Test.xcconfig */, - ); - path = Configurations; - sourceTree = ""; - }; - 35CD64EE1E60192300AF060B /* Targets */ = { - isa = PBXGroup; - children = ( - 35CD64EF1E60192300AF060B /* Application.xcconfig */, - 35CD64F01E60192300AF060B /* Framework.xcconfig */, - 35CD64F11E60192300AF060B /* StaticLibrary.xcconfig */, - ); - path = Targets; - sourceTree = ""; - }; - 35CD65031E60192300AF060B /* iOS */ = { - isa = PBXGroup; - children = ( - 35CD65041E60192300AF060B /* iOS-Application.xcconfig */, - 35CD65051E60192300AF060B /* iOS-Base.xcconfig */, - 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */, - 35CD65071E60192300AF060B /* iOS-StaticLibrary.xcconfig */, - ); - path = iOS; - sourceTree = ""; - }; - 35CD65081E60192300AF060B /* Mac OS X */ = { - isa = PBXGroup; - children = ( - 35CD65091E60192300AF060B /* Mac-Application.xcconfig */, - 35CD650A1E60192300AF060B /* Mac-Base.xcconfig */, - 35CD650B1E60192300AF060B /* Mac-DynamicLibrary.xcconfig */, - 35CD650C1E60192300AF060B /* Mac-Framework.xcconfig */, - 35CD650D1E60192300AF060B /* Mac-StaticLibrary.xcconfig */, - ); - path = "Mac OS X"; - sourceTree = ""; - }; - 35CD650F1E60192300AF060B /* tvOS */ = { - isa = PBXGroup; - children = ( - 35CD65101E60192300AF060B /* tvOS-Application.xcconfig */, - 35CD65111E60192300AF060B /* tvOS-Base.xcconfig */, - 35CD65121E60192300AF060B /* tvOS-Framework.xcconfig */, - 35CD65131E60192300AF060B /* tvOS-StaticLibrary.xcconfig */, - ); - path = tvOS; - sourceTree = ""; - }; - 35CD65141E60192300AF060B /* watchOS */ = { - isa = PBXGroup; - children = ( - 35CD65151E60192300AF060B /* watchOS-Application.xcconfig */, - 35CD65161E60192300AF060B /* watchOS-Base.xcconfig */, - 35CD65171E60192300AF060B /* watchOS-Framework.xcconfig */, - 35CD65181E60192300AF060B /* watchOS-StaticLibrary.xcconfig */, - ); - path = watchOS; - sourceTree = ""; - }; 57826BA81F29491800FB0414 /* Example */ = { isa = PBXGroup; children = ( @@ -674,7 +551,6 @@ /* Begin XCBuildConfiguration section */ 3549BB0B1DA387DB00C63030 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35CD64EA1E60192300AF060B /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -736,7 +612,6 @@ }; 3549BB0C1DA387DB00C63030 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35CD64EC1E60192300AF060B /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -791,7 +666,6 @@ }; 3549BB271DA389CD00C63030 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; @@ -811,7 +685,6 @@ }; 3549BB281DA389CD00C63030 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; diff --git a/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift b/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift index 01a4b76..380594e 100644 --- a/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift +++ b/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift @@ -69,7 +69,7 @@ public extension Reactive where Base: ASTableNode { var itemInserted: ControlEvent { let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:))) .filter { a in - return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .insert + return UITableViewCell.EditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .insert } .map { a in return (try castOrThrow(IndexPath.self, a[2])) @@ -84,7 +84,7 @@ public extension Reactive where Base: ASTableNode { var itemDeleted: ControlEvent { let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:))) .filter { a in - return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .delete + return UITableViewCell.EditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .delete } .map { a in return try castOrThrow(IndexPath.self, a[2])