From af0c4598be684d5dda0a7bf295febb42154b46bb Mon Sep 17 00:00:00 2001 From: Arnaud Dorgans Date: Thu, 4 Jan 2018 13:03:59 +0100 Subject: [PATCH] fix spec --- InfiniteLayout.podspec | 18 +++++++++--------- .../Classes/InfiniteCollectionView.swift | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/InfiniteLayout.podspec b/InfiniteLayout.podspec index 5f4cbd7..a3d5881 100644 --- a/InfiniteLayout.podspec +++ b/InfiniteLayout.podspec @@ -30,7 +30,7 @@ Horizontal and Vertical infinite scrolling feature for UICollectionView with Pag s.ios.deployment_target = '8.0' s.tvos.deployment_target = '9.0' - + #s.xcconfig = { 'SWIFT_OBJC_BRIDGING_HEADER' => '${POD_ROOT}/InfiniteLayout/BridgeHeader.h' } # s.resource_bundles = { @@ -43,15 +43,15 @@ Horizontal and Vertical infinite scrolling feature for UICollectionView with Pag s.default_subspec = 'Core' - s.subspec 'Core' do |sp| - sp.source_files = 'InfiniteLayout/Classes/**/*' + s.subspec 'Core' do |core| + core.source_files = 'InfiniteLayout/Classes/**/*' end - s.subspec 'Rx' do |sp| - sp.dependency 'InfiniteLayout/Core', '~> 0.1' - sp.dependency 'RxSwift', '~> 4.0' - sp.dependency 'RxCocoa', '~> 4.0' - sp.dependency 'RxDataSources', '~> 3.0' - sp.source_files = 'InfiniteLayout/Rx/**/*' + s.subspec 'Rx' do |rx| + rx.dependency 'InfiniteLayout/Core', '~> 0.1' + rx.dependency 'RxSwift', '~> 4.0' + rx.dependency 'RxCocoa', '~> 4.0' + rx.dependency 'RxDataSources', '~> 3.0' + rx.source_files = 'InfiniteLayout/Rx/**/*' end end diff --git a/InfiniteLayout/Classes/InfiniteCollectionView.swift b/InfiniteLayout/Classes/InfiniteCollectionView.swift index 0697b95..6a8f245 100644 --- a/InfiniteLayout/Classes/InfiniteCollectionView.swift +++ b/InfiniteLayout/Classes/InfiniteCollectionView.swift @@ -105,7 +105,9 @@ open class InfiniteCollectionView: UICollectionView { private func sharedInit() { self.showsVerticalScrollIndicator = false self.showsHorizontalScrollIndicator = false - self.scrollsToTop = false + #if os(iOS) + self.scrollsToTop = false + #endif } open override func layoutSubviews() {