Remove catalyst restraction

ivanvorobei · ivanvorobei · commit e69bec199ca7 · 2020-10-07T17:38:35.000+03:00
diff --git a/Example/Controllers/SideBarController.swift b/Example/Controllers/SideBarController.swift
@@ -1,6 +1,6 @@
 import UIKit
 
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 class SidebarController: SPDiffableSideBarController {
     
     override func viewDidLoad() {
@@ -63,7 +63,7 @@ class SidebarController: SPDiffableSideBarController {
     }
 }
 
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 class SideBarSplitController: UISplitViewController {
     
     init() {
diff --git a/Example/Example.entitlements b/Example/Example.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SPDiffable.xcodeproj/project.pbxproj b/SPDiffable.xcodeproj/project.pbxproj
@@ -92,6 +92,7 @@
 		F4920A6324F3BFFA007F7EE9 /* SPDiffableWrapperItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableWrapperItem.swift; sourceTree = "<group>"; };
 		F4920A6824F447D6007F7EE9 /* SPDiffableTableCellProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableTableCellProviders.swift; sourceTree = "<group>"; };
 		F4920A6B24F44834007F7EE9 /* SPDiffableCollectionCellProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionCellProviders.swift; sourceTree = "<group>"; };
+		F4977BC6252E079A00B20771 /* Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Example.entitlements; sourceTree = "<group>"; };
 		OBJ_10 /* SPDiffableCollectionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionController.swift; sourceTree = "<group>"; };
 		OBJ_11 /* SPDiffableCollectionDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionDataSource.swift; sourceTree = "<group>"; };
 		OBJ_12 /* SPDiffableSideBarButtonCollectionViewListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableSideBarButtonCollectionViewListCell.swift; sourceTree = "<group>"; };
@@ -143,6 +144,7 @@
 		F47A41CF24EB222C0054DBB2 /* Example */ = {
 			isa = PBXGroup;
 			children = (
+				F4977BC6252E079A00B20771 /* Example.entitlements */,
 				F47A41EB24EB22A70054DBB2 /* App */,
 				F47A41E424EB22A70054DBB2 /* Controllers */,
 				F47A41DE24EB222D0054DBB2 /* Info.plist */,
@@ -347,7 +349,7 @@
 				TargetAttributes = {
 					F47A41CD24EB222C0054DBB2 = {
 						CreatedOnToolsVersion = 12.0;
-						DevelopmentTeam = 28DU8642K3;
+						DevelopmentTeam = Z384JW42NU;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -502,8 +504,9 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 28DU8642K3;
+				DEVELOPMENT_TEAM = Z384JW42NU;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -527,6 +530,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = by.ivanvorobei.SPDiffable;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -567,9 +571,10 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 28DU8642K3;
+				DEVELOPMENT_TEAM = Z384JW42NU;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -588,6 +593,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = by.ivanvorobei.SPDiffable;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
diff --git a/Sources/SPDiffable/CellProvider/Models/SPDiffableSnapshot.swift b/Sources/SPDiffable/CellProvider/Models/SPDiffableSnapshot.swift
@@ -30,5 +30,5 @@ public typealias SPDiffableSnapshot = NSDiffableDataSourceSnapshot<SPDiffableSec
 /**
  Wrapper of NSDiffableDataSourceSectionSnapshot  with basic `SPDiffableItem`.
  */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 public typealias SPDiffableSectionSnapshot = NSDiffableDataSourceSectionSnapshot<SPDiffableItem>
diff --git a/Sources/SPDiffable/CellProvider/SPDiffableCollectionCellProviders.swift b/Sources/SPDiffable/CellProvider/SPDiffableCollectionCellProviders.swift
@@ -6,7 +6,7 @@ public enum SPDiffableCollectionCellProviders {
      Defaults cell provider, which can help you doing side bar faster.
      You can do your providers and ise its with more flexible.
      */
-    @available(iOS 14, macCatalyst 14, *)
+    @available(iOS 14, *)
     public static var sideBar: SPDiffableCollectionCellProvider {
         let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
             let providers = [sideBarItem, sideBarButton, sideBarHeader]
@@ -20,7 +20,7 @@ public enum SPDiffableCollectionCellProviders {
         return cellProvider
     }
     
-    @available(iOS 14, macCatalyst 14, *)
+    @available(iOS 14, *)
     public static var sideBarItem: SPDiffableCollectionCellProvider {
         let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
             guard let item = item as? SPDiffableSideBarItem else { return nil }
@@ -36,7 +36,7 @@ public enum SPDiffableCollectionCellProviders {
         return cellProvider
     }
     
-    @available(iOS 14, macCatalyst 14, *)
+    @available(iOS 14, *)
     public static var sideBarButton: SPDiffableCollectionCellProvider {
         let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
             guard let item = item as? SPDiffableSideBarButton else { return nil }
@@ -49,7 +49,7 @@ public enum SPDiffableCollectionCellProviders {
         return cellProvider
     }
     
-    @available(iOS 14, macCatalyst 14, *)
+    @available(iOS 14, *)
     public static var sideBarHeader: SPDiffableCollectionCellProvider {
         let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
             guard let item = item as? SPDiffableSideBarHeader else { return nil }
diff --git a/Sources/SPDiffable/Collection/Models/SPDiffableSideBarButton.swift b/Sources/SPDiffable/Collection/Models/SPDiffableSideBarButton.swift
@@ -26,7 +26,7 @@ import UIKit
  
  Colorful title usually.
  */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 open class SPDiffableSideBarButton: SPDiffableItem {
     
     public let title: String
diff --git a/Sources/SPDiffable/Collection/Models/SPDiffableSideBarHeader.swift b/Sources/SPDiffable/Collection/Models/SPDiffableSideBarHeader.swift
@@ -24,7 +24,7 @@ import UIKit
 /**
  Header model for side bar item.
  */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 open class SPDiffableSideBarHeader: SPDiffableItem {
     
     public var text: String
diff --git a/Sources/SPDiffable/Collection/Models/SPDiffableSideBarItem.swift b/Sources/SPDiffable/Collection/Models/SPDiffableSideBarItem.swift
@@ -26,7 +26,7 @@ import UIKit
  
  For header use `SPDiffableSideBarHeader` class.
  */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 open class SPDiffableSideBarItem: SPDiffableItem {
     
     public let title: String
diff --git a/Sources/SPDiffable/Collection/SPDiffableSideBarButtonCollectionViewListCell.swift b/Sources/SPDiffable/Collection/SPDiffableSideBarButtonCollectionViewListCell.swift
@@ -28,7 +28,7 @@ import UIKit
  Also not show background selection, but cell selected. Need deselect it manually.
  Configure it cell need via `updateWithItem` func.
  */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 class SPDiffableSideBarButtonCollectionViewListCell: UICollectionViewListCell {
     
     private var item: SPDiffableSideBarButton? = nil
diff --git a/Sources/SPDiffable/Collection/SPDiffableSideBarController.swift b/Sources/SPDiffable/Collection/SPDiffableSideBarController.swift
@@ -30,7 +30,7 @@ Basic side bar controller.
  Collection configuration setted to `.sidebar`.
  Layout detect data source and automatically set header and footer mode.
 */
-@available(iOS 14, macCatalyst 14, *)
+@available(iOS 14, *)
 open class SPDiffableSideBarController: UIViewController, UICollectionViewDelegate {
     
     public var collectionView: UICollectionView!

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import UIKit`
`2`	`2`
`3`		`-@available(iOS 14, macCatalyst 14, *)`
	`3`	`+@available(iOS 14, *)`
`4`	`4`	`class SidebarController: SPDiffableSideBarController {`
`5`	`5`
`6`	`6`	`override func viewDidLoad() {`
`@@ -63,7 +63,7 @@ class SidebarController: SPDiffableSideBarController {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-@available(iOS 14, macCatalyst 14, *)`
	`66`	`+@available(iOS 14, *)`
`67`	`67`	`class SideBarSplitController: UISplitViewController {`
`68`	`68`
`69`	`69`	`init() {`