From 9d53a8be925d475dfc2f121c86f85f910ec046e6 Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Wed, 15 Sep 2021 22:01:05 +0000 Subject: [PATCH 1/8] Added Swift tools version specification --- Package.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index 1cdafc7..6b80ebf 100644 --- a/Package.swift +++ b/Package.swift @@ -1,3 +1,5 @@ +// swift-tools-version:5.4.0 + import PackageDescription let package = Package( From 8b7412593f7f21d0f5bf83c10dc2c32248d8038e Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Wed, 15 Sep 2021 22:09:56 +0000 Subject: [PATCH 2/8] Removed empty line --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6b80ebf..e1bbf7a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ // swift-tools-version:5.4.0 - import PackageDescription let package = Package( From a9767f3c936472d04c8ae42aba2513b80d86f005 Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 00:20:44 +0200 Subject: [PATCH 3/8] Updated package description --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index e1bbf7a..4cfa21b 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,8 @@ import PackageDescription let package = Package( name: "InfiniteCollectionView", - targets: [], dependencies: [ - .Package(url: "https://github.com/hryk224/InfiniteCollectionView", majorVersion: 1), - ] + .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.2"), + ], + targets: [] ) From ea6c1965613e39a40a2bb9c27cc55feaa0e50bae Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 00:24:42 +0200 Subject: [PATCH 4/8] Updated min version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 4cfa21b..c9f634e 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "InfiniteCollectionView", dependencies: [ - .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.2"), + .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.3"), ], targets: [] ) From 37277ed8a68fe23f5fb9a124b2c768f6df0c16ee Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 00:32:21 +0200 Subject: [PATCH 5/8] Added product to package description --- Package.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c9f634e..a2ddc60 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,14 @@ import PackageDescription let package = Package( name: "InfiniteCollectionView", + products: [ + .library( + name: "InfiniteCollectionView", + targets: ["InfiniteCollectionView"] + ) + ], dependencies: [ - .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.3"), + .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.4"), ], targets: [] ) From 147173c940293b3632ab9d1d6aef14c09eb279bb Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 00:45:23 +0200 Subject: [PATCH 6/8] Fixed path value in target --- Package.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index a2ddc60..1f15e94 100644 --- a/Package.swift +++ b/Package.swift @@ -3,14 +3,16 @@ import PackageDescription let package = Package( name: "InfiniteCollectionView", + platforms: [ + .iOS(.v10), + ], products: [ .library( name: "InfiniteCollectionView", targets: ["InfiniteCollectionView"] ) ], - dependencies: [ - .package(url: "https://github.com/pavelaron/InfiniteCollectionView", from: "1.3.4"), - ], - targets: [] + targets: [ + .target(name: "InfiniteCollectionView", path: "Sources"), + ] ) From b44da3271bc5b5aaf926ae72755f4414b8c5f633 Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 00:59:39 +0200 Subject: [PATCH 7/8] Syntax fix --- Sources/InfiniteCollectionView.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/InfiniteCollectionView.swift b/Sources/InfiniteCollectionView.swift index 5111dde..f3d0661 100644 --- a/Sources/InfiniteCollectionView.swift +++ b/Sources/InfiniteCollectionView.swift @@ -44,12 +44,12 @@ open class InfiniteCollectionView: UICollectionView { configure() } deinit { - NotificationCenter.default.removeObserver(self, name: .UIDeviceOrientationDidChange, object: nil) + NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil) } open func rotate(_ notification: Notification) { setContentOffset(CGPoint(x: CGFloat(pageIndex + indexOffset) * itemWidth, y: contentOffset.y), animated: false) } - open override func selectItem(at indexPath: IndexPath?, animated: Bool, scrollPosition: UICollectionViewScrollPosition) { + open override func selectItem(at indexPath: IndexPath?, animated: Bool, scrollPosition: UICollectionView.ScrollPosition) { guard let indexPath = indexPath else { return } // Correct the input IndexPath let correctedIndexPath = IndexPath(row: correctedIndex(indexPath.item + indexOffset), section: 0) @@ -84,7 +84,7 @@ private extension InfiniteCollectionView { delegate = self dataSource = self register(UICollectionViewCell.self, forCellWithReuseIdentifier: defaultIdentifier) - NotificationCenter.default.addObserver(self, selector: #selector(InfiniteCollectionView.rotate(_:)), name: .UIDeviceOrientationDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(InfiniteCollectionView.rotate(_:)), name: UIDevice.orientationDidChangeNotification, object: nil) } func centerIfNeeded(_ scrollView: UIScrollView) { let currentOffset = contentOffset From 9d653c9bafecac7d5d49311e38e632161d32f05e Mon Sep 17 00:00:00 2001 From: Aron Pavel Date: Thu, 16 Sep 2021 01:05:04 +0200 Subject: [PATCH 8/8] Fixed missing @objc from method --- Sources/InfiniteCollectionView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/InfiniteCollectionView.swift b/Sources/InfiniteCollectionView.swift index f3d0661..8ff2bcc 100644 --- a/Sources/InfiniteCollectionView.swift +++ b/Sources/InfiniteCollectionView.swift @@ -46,7 +46,7 @@ open class InfiniteCollectionView: UICollectionView { deinit { NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil) } - open func rotate(_ notification: Notification) { + @objc open func rotate(_ notification: Notification) { setContentOffset(CGPoint(x: CGFloat(pageIndex + indexOffset) * itemWidth, y: contentOffset.y), animated: false) } open override func selectItem(at indexPath: IndexPath?, animated: Bool, scrollPosition: UICollectionView.ScrollPosition) {