Merge pull request #38 from eure/spm

ntnmrndn · web-flow · commit fdc6c4654eaf · 2022-01-12T14:39:23.000+09:00
Add SPM support
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,38 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "MosaiqueAssetsPicker",
+     platforms: [
+        .iOS(.v10)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "MosaiqueAssetsPicker",
+            targets: ["MosaiqueAssetsPicker"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "MosaiqueAssetsPicker",
+            dependencies: [],
+            path: "Sources/MosaiqueAssetsPicker",
+            exclude:["Info.plist"]
+            ),
+        .testTarget(
+            name: "MosaiqueAssetsPickerTests",
+            dependencies: ["MosaiqueAssetsPicker"],
+            path: "Tests/AssetsPickerTests",
+            exclude:["Info.plist"]
+            ),
+    ],
+    swiftLanguageVersions: [.v5]
+)
diff --git a/README.md b/README.md
@@ -140,6 +140,14 @@ You can default to it if the user runs iOS 14 by using the new API:
 
 ```pod 'MosaiqueAssetsPicker'```
 
+### SPM:
+
+```
+dependencies: [
+    .package(url: "https://github.com/eure/AssetsPicker.git", .upToNextMajor(from: "1.3.0"))
+]
+```
+
 ### What's using MosaiqueAssetsPicker
 
 - Pairs Engage
diff --git a/Sources/MosaiqueAssetsPicker/Configuration/MosaiqueAssetPickerConfiguration.swift b/Sources/MosaiqueAssetsPicker/Configuration/MosaiqueAssetPickerConfiguration.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
+
 import Foundation
 import enum Photos.PHAssetMediaType
 import PhotosUI
@@ -109,3 +111,4 @@ public struct MosaiqueAssetPickerConfiguration {
 
     public init() {}
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/AssetFuture.swift b/Sources/MosaiqueAssetsPicker/Utils/AssetFuture.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2019 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import Photos
 import PhotosUI
@@ -208,3 +209,4 @@ public class AssetFuture {
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/AssetPickerCellRegistrator.swift b/Sources/MosaiqueAssetsPicker/Utils/AssetPickerCellRegistrator.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import UIKit
 
@@ -60,3 +61,4 @@ public class AssetPickerCellRegistrator {
         customAssetItemClasses[cellType] = (cellClass, cellIdentifier)
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/MosaiqueAssetPickerPresenter.swift b/Sources/MosaiqueAssetsPicker/Utils/MosaiqueAssetPickerPresenter.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2020 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import Photos
 import PhotosUI
@@ -69,3 +70,4 @@ public final class MosaiqueAssetPickerPresenter: PHPickerViewControllerDelegate
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/NSLock+exec.swift b/Sources/MosaiqueAssetsPicker/Utils/NSLock+exec.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2019 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 
 extension NSLock {
@@ -16,3 +17,4 @@ extension NSLock {
         return result
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/NotificationCenter+assetPicker.swift b/Sources/MosaiqueAssetsPicker/Utils/NotificationCenter+assetPicker.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2019 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 
 let PhotoPickerPickAssetsNotificationName = NSNotification.Name(rawValue: "jp.eure.assetspicke.PhotoPickerPickAssestNotification")
@@ -14,3 +15,4 @@ let PhotoPickerCancelNotificationName = NSNotification.Name(rawValue: "jp.eure.a
 extension NotificationCenter {
     static let assetPicker = NotificationCenter()
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/SelectionContainer.swift b/Sources/MosaiqueAssetsPicker/Utils/SelectionContainer.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import Photos
 
@@ -75,3 +76,4 @@ public final class SelectionContainer<T: ItemIdentifier> {
         selectedItems = []
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Utils/ViewSizeCalculator.swift b/Sources/MosaiqueAssetsPicker/Utils/ViewSizeCalculator.swift
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if os(iOS)
 import UIKit
 
 public struct ViewSizeCalculator<T: UIView> {
@@ -67,3 +68,4 @@ public struct ViewSizeCalculator<T: UIView> {
         return size
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewControllers/AssetDetailViewController.swift b/Sources/MosaiqueAssetsPicker/ViewControllers/AssetDetailViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Photos
 import UIKit
 
@@ -308,3 +309,4 @@ private enum HorizontalStackItemSizeCalculator {
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewControllers/AssetsCollectionViewController.swift b/Sources/MosaiqueAssetsPicker/ViewControllers/AssetsCollectionViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Photos
 import UIKit
 
@@ -150,3 +151,4 @@ extension AssetsCollectionViewController: AssetCollectionViewModelDelegate {
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewControllers/MosaiqueAssetPickerViewController.swift b/Sources/MosaiqueAssetsPicker/ViewControllers/MosaiqueAssetPickerViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import enum Photos.PHAssetMediaType
 import UIKit
 
@@ -163,3 +164,4 @@ public extension MosaiqueAssetPickerViewController {
         return self
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewControllers/SelectAssetCollectionContainerViewController.swift b/Sources/MosaiqueAssetsPicker/ViewControllers/SelectAssetCollectionContainerViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import Photos
 import UIKit
@@ -102,3 +103,4 @@ final class SelectAssetCollectionContainerViewController: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewModel/AssetCollectionCellViewModel.swift b/Sources/MosaiqueAssetsPicker/ViewModel/AssetCollectionCellViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Foundation
 import Photos
 import UIKit
@@ -101,3 +102,4 @@ public final class AssetCollectionCellViewModel: ItemIdentifier {
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewModel/AssetDetailCellViewModel.swift b/Sources/MosaiqueAssetsPicker/ViewModel/AssetDetailCellViewModel.swift
@@ -5,7 +5,7 @@
 //  Created by Aymen Rebouh on 2018/10/19.
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
-
+#if os(iOS)
 import Foundation
 import Photos
 import UIKit.UIImage
@@ -148,3 +148,4 @@ public final class AssetDetailCellViewModel: ItemIdentifier {
         asset.localIdentifier
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewModel/AssetDetailViewModel.swift b/Sources/MosaiqueAssetsPicker/ViewModel/AssetDetailViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2019 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Photos
 import UIKit.UIImage
 
@@ -135,3 +136,4 @@ extension AssetDetailViewModel: PHPhotoLibraryChangeObserver {
         }
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/ViewModel/AssetsCollectionViewModel.swift b/Sources/MosaiqueAssetsPicker/ViewModel/AssetsCollectionViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import Photos
 import UIKit
 
@@ -141,3 +142,4 @@ private extension PHFetchResult where ObjectType == PHAssetCollection {
         return array
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Views/AssetCollectionCell.swift b/Sources/MosaiqueAssetsPicker/Views/AssetCollectionCell.swift
@@ -5,7 +5,7 @@
 //  Created by Aymen Rebouh on 2018/10/18.
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
-
+#if os(iOS)
 import Foundation
 import UIKit
 
@@ -108,3 +108,4 @@ extension AssetCollectionCell: AssetsCollectionCellViewModelDelegate {
         assetNumberOfItemsLabel.text = numberOfAssets
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Views/AssetDetailCell.swift b/Sources/MosaiqueAssetsPicker/Views/AssetDetailCell.swift
@@ -5,7 +5,7 @@
 //  Created by Aymen Rebouh on 2018/10/19.
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
-
+#if os(iOS)
 import Foundation
 import UIKit
 
@@ -167,3 +167,4 @@ extension AssetDetailCell: AssetDetailCellViewModelDelegate {
         setDownloading(isDownloading)
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Views/AssetDetailHeaderContainerView.swift b/Sources/MosaiqueAssetsPicker/Views/AssetDetailHeaderContainerView.swift
@@ -5,7 +5,7 @@
 //  Created by Aymen Rebouh on 2018/10/29.
 //  Copyright © 2018 eureka, Inc. All rights reserved.
 //
-
+#if os(iOS)
 import Foundation
 import UIKit
 
@@ -23,3 +23,4 @@ final class AssetDetailHeaderContainerView: UICollectionReusableView {
         ])
     }
 }
+#endif
diff --git a/Sources/MosaiqueAssetsPicker/Views/GradientView.swift b/Sources/MosaiqueAssetsPicker/Views/GradientView.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2020 eureka, Inc. All rights reserved.
 //
 
+#if os(iOS)
 import UIKit
 
 final class GradiantView: UIView {
@@ -31,3 +32,4 @@ final class GradiantView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2019 eureka, Inc. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if os(iOS)`
`9`	`10`	`import Foundation`
`10`	`11`	`import Photos`
`11`	`12`	`import PhotosUI`
`@@ -208,3 +209,4 @@ public class AssetFuture {`
`208`	`209`	`}`
`209`	`210`	`}`
`210`	`211`	`}`
	`212`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2018 eureka, Inc. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if os(iOS)`
`9`	`10`	`import Foundation`
`10`	`11`	`import UIKit`
`11`	`12`
`@@ -60,3 +61,4 @@ public class AssetPickerCellRegistrator {`
`60`	`61`	`customAssetItemClasses[cellType] = (cellClass, cellIdentifier)`
`61`	`62`	`}`
`62`	`63`	`}`
	`64`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2020 eureka, Inc. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if os(iOS)`
`9`	`10`	`import Foundation`
`10`	`11`	`import Photos`
`11`	`12`	`import PhotosUI`
`@@ -69,3 +70,4 @@ public final class MosaiqueAssetPickerPresenter: PHPickerViewControllerDelegate`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`}`
	`73`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`21`	`21`	`// THE SOFTWARE.`
`22`	`22`
	`23`	`+#if os(iOS)`
`23`	`24`	`import UIKit`
`24`	`25`
`25`	`26`	`public struct ViewSizeCalculator<T: UIView> {`
`@@ -67,3 +68,4 @@ public struct ViewSizeCalculator<T: UIView> {`
`67`	`68`	`return size`
`68`	`69`	`}`
`69`	`70`	`}`
	`71`	`+#endif`