diff --git a/Example/InfiniteLayout.xcodeproj/project.pbxproj b/Example/InfiniteLayout.xcodeproj/project.pbxproj index 2e0bd5d..7fd0869 100644 --- a/Example/InfiniteLayout.xcodeproj/project.pbxproj +++ b/Example/InfiniteLayout.xcodeproj/project.pbxproj @@ -331,6 +331,7 @@ "${BUILT_PRODUCTS_DIR}/InfiniteLayout/InfiniteLayout.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxDataSources/RxDataSources.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -340,6 +341,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/InfiniteLayout.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxDataSources.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 0b8df6c..ada5962 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,24 +1,27 @@ PODS: - CocoaProxy (0.1.1) - - Differentiator (3.1.0) - - InfiniteLayout (0.3): + - Differentiator (4.0.1) + - InfiniteLayout (0.4.1): - CocoaProxy (~> 0) - - InfiniteLayout/Core (= 0.3) - - InfiniteLayout/Core (0.3): + - InfiniteLayout/Core (= 0.4.1) + - InfiniteLayout/Core (0.4.1): - CocoaProxy (~> 0) - - InfiniteLayout/Rx (0.3): + - InfiniteLayout/Rx (0.4.1): - CocoaProxy (~> 0) - InfiniteLayout/Core (~> 0) - - RxCocoa (~> 4) - - RxDataSources (~> 3) - - RxSwift (~> 4) - - RxCocoa (4.5.0): - - RxSwift (>= 4.4.2, ~> 4.4) - - RxDataSources (3.1.0): - - Differentiator (~> 3.0) - - RxCocoa (~> 4.0) - - RxSwift (~> 4.0) - - RxSwift (4.5.0) + - RxCocoa (~> 5) + - RxDataSources (~> 4) + - RxSwift (~> 5) + - RxCocoa (5.0.0): + - RxRelay (~> 5) + - RxSwift (~> 5) + - RxDataSources (4.0.1): + - Differentiator (~> 4.0) + - RxCocoa (~> 5.0) + - RxSwift (~> 5.0) + - RxRelay (5.0.0): + - RxSwift (~> 5) + - RxSwift (5.0.0) DEPENDENCIES: - InfiniteLayout (from `../`) @@ -30,6 +33,7 @@ SPEC REPOS: - Differentiator - RxCocoa - RxDataSources + - RxRelay - RxSwift EXTERNAL SOURCES: @@ -38,11 +42,12 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaProxy: 35ab81e24325b33834cffe45a3d1fd48ca67ef3a - Differentiator: be49ca3408f0ecfc761e4c7763d20c62be01b9ad - InfiniteLayout: 24d5e5ea1528bb86ee00a4e3c02f93fdb38e3f68 - RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0 - RxDataSources: a843bad90c29817f5923ec8163f4af2de084ceb3 - RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575 + Differentiator: 886080237d9f87f322641dedbc5be257061b0602 + InfiniteLayout: 458eadbcb94afc3d777141990fbfe7a804a35609 + RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8 + RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114 + RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18 + RxSwift: 8b0671caa829a763bbce7271095859121cbd895f PODFILE CHECKSUM: 0dc7a9b37f9b7c5d5266beaab9e94861b80aa80f diff --git a/InfiniteLayout.podspec b/InfiniteLayout.podspec index 3ad01bc..5f5a336 100644 --- a/InfiniteLayout.podspec +++ b/InfiniteLayout.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'InfiniteLayout' - s.version = '0.4' + s.version = '0.4.1' s.summary = 'Horizontal and Vertical infinite scrolling feature for UICollectionView with Paging, NSProxy delegate, Reactive extension' # This description is used to generate tags and improve search results. @@ -49,9 +49,9 @@ Horizontal and Vertical infinite scrolling feature for UICollectionView with Pag s.subspec 'Rx' do |rx| rx.dependency 'InfiniteLayout/Core', '~> 0' - rx.dependency 'RxSwift', '~> 4.5' - rx.dependency 'RxCocoa', '~> 4.5' - rx.dependency 'RxDataSources', '~> 3.1' + rx.dependency 'RxSwift', '~> 5' + rx.dependency 'RxCocoa', '~> 5' + rx.dependency 'RxDataSources', '~> 4' rx.source_files = 'InfiniteLayout/Rx/**/*' end end diff --git a/InfiniteLayout/Rx/InfiniteCollectionView+Rx.swift b/InfiniteLayout/Rx/InfiniteCollectionView+Rx.swift index fd2db8c..4ae68a2 100644 --- a/InfiniteLayout/Rx/InfiniteCollectionView+Rx.swift +++ b/InfiniteLayout/Rx/InfiniteCollectionView+Rx.swift @@ -58,7 +58,7 @@ extension Reactive where Base: RxInfiniteCollectionView { (infinite: Bool) -> (_ source: O) -> (_ cellFactory: @escaping (UICollectionView, Int, S.Iterator.Element) -> UICollectionViewCell) - -> Disposable where O.E == S { + -> Disposable where O.Element == S { return { source in guard infinite else { return self.items(source) @@ -76,7 +76,7 @@ extension Reactive where Base: RxInfiniteCollectionView { (cellIdentifier: String, cellType: Cell.Type = Cell.self, infinite: Bool) -> (_ source: O) -> (_ configureCell: @escaping (Int, S.Iterator.Element, Cell) -> Void) - -> Disposable where O.E == S { + -> Disposable where O.Element == S { guard infinite else { return self.items(cellIdentifier: cellIdentifier, cellType: cellType) } diff --git a/InfiniteLayout/Rx/RxInfiniteCollectionViewDataSource.swift b/InfiniteLayout/Rx/RxInfiniteCollectionViewDataSource.swift index 4cfbd98..2cfe8cf 100644 --- a/InfiniteLayout/Rx/RxInfiniteCollectionViewDataSource.swift +++ b/InfiniteLayout/Rx/RxInfiniteCollectionViewDataSource.swift @@ -17,7 +17,7 @@ open class RxInfiniteCollectionViewSectionedReloadDataSource I { + open override subscript(indexPath: IndexPath) -> Item { get { let indexPath = InfiniteDataSources.indexPath(from: indexPath, numberOfSections: sectionModels.count, @@ -63,7 +63,7 @@ open class RxInfiniteCollectionViewSectionedAnimatedDataSource I { + open override subscript(indexPath: IndexPath) -> Item { get { let indexPath = InfiniteDataSources.indexPath(from: indexPath, numberOfSections: sectionModels.count,