Added tvOS Support.

ivanvorobei · ivanvorobei · commit 92af5ec067f0 · 2022-02-11T14:24:54.000+03:00
diff --git a/Example Apps/SPDiffable.xcodeproj/project.pbxproj b/Example Apps/SPDiffable.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -13,7 +13,6 @@
 		F47A41FC24EB22A70054DBB2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F47A41EC24EB22A70054DBB2 /* Assets.xcassets */; };
 		F47A41FD24EB22A70054DBB2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F47A41ED24EB22A70054DBB2 /* LaunchScreen.storyboard */; };
 		F47A41FF24EB22A70054DBB2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47A41EF24EB22A70054DBB2 /* AppDelegate.swift */; };
-		F4FA2E772658E5F200CBDD22 /* SPDiffable in Frameworks */ = {isa = PBXBuildFile; productRef = F4FA2E762658E5F200CBDD22 /* SPDiffable */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -39,15 +38,14 @@
 		F47A41EE24EB22A70054DBB2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		F47A41EF24EB22A70054DBB2 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F4977BC6252E079A00B20771 /* Entitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Entitlements.entitlements; sourceTree = "<group>"; };
-		F4FA2E742658E5C300CBDD22 /* SPDiffable */ = {isa = PBXFileReference; lastKnownFileType = folder; name = SPDiffable; path = ..; sourceTree = "<group>"; };
+		F4DE1B2A27B67B7E00A608F1 /* SPDiffable */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SPDiffable; path = ..; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		F47A41CB24EB222C0054DBB2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F4FA2E772658E5F200CBDD22 /* SPDiffable in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -103,7 +101,7 @@
 		OBJ_5 = {
 			isa = PBXGroup;
 			children = (
-				F4FA2E742658E5C300CBDD22 /* SPDiffable */,
+				F4DE1B2A27B67B7E00A608F1 /* SPDiffable */,
 				F47A41CF24EB222C0054DBB2 /* iOS Example */,
 				OBJ_42 /* Products */,
 				F4FA2E752658E5F200CBDD22 /* Frameworks */,
@@ -128,7 +126,6 @@
 			);
 			name = "Example iOS";
 			packageProductDependencies = (
-				F4FA2E762658E5F200CBDD22 /* SPDiffable */,
 			);
 			productName = Example;
 			productReference = F47A41CE24EB222C0054DBB2 /* Example iOS.app */;
@@ -261,10 +258,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "iOS Example/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = by.ivanvorobei.opensource.spdiffable;
@@ -327,10 +321,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "iOS Example/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = by.ivanvorobei.opensource.spdiffable;
@@ -442,8 +433,7 @@
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				USE_HEADERMAP = NO;
 			};
 			name = Release;
@@ -470,13 +460,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		F4FA2E762658E5F200CBDD22 /* SPDiffable */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SPDiffable;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = OBJ_1 /* Project object */;
 }
diff --git a/Example Apps/SPDiffable.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example Apps/SPDiffable.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-    <false/>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<true/>
 </dict>
-</plist>
+</plist>
diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "SPDiffable",
     platforms: [
-        .iOS(.v12)
+        .iOS(.v12), .tvOS(.v12)
     ],
     products: [
         .library(
diff --git a/SPDiffable.podspec b/SPDiffable.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'SPDiffable'
-  s.version = '4.0.0'
+  s.version = '4.0.4'
   s.summary = 'Extension of Diffable API which allow not duplicate code and use less models. Included example for SideBar.'
   s.homepage = 'https://github.com/ivanvorobei/SPDiffable'
   s.source = { :git => 'https://github.com/ivanvorobei/SPDiffable.git', :tag => s.version }
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
   
   s.swift_version = '5.1'
   s.ios.deployment_target = '12.0'
+  s.tvos.deployment_target = '12.0'
 
   s.source_files  = 'Sources/SPDiffable/**/*.swift'
 
diff --git a/Sources/SPDiffable/Collection/DataSource/AppleCollectionDiffableDataSource.swift b/Sources/SPDiffable/Collection/DataSource/AppleCollectionDiffableDataSource.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 class AppleCollectionDiffableDataSource: UICollectionViewDiffableDataSource<SPDiffableSection, SPDiffableItem> {
     
     // MARK: - Init
@@ -37,8 +37,9 @@ class AppleCollectionDiffableDataSource: UICollectionViewDiffableDataSource<SPDi
     
     // MARK: - Wrappers
     
+    @available(tvOS 13.0, *)
     typealias Snapshot = NSDiffableDataSourceSnapshot<SPDiffableSection, SPDiffableItem>
     
-    @available(iOS 14.0, *)
+    @available(iOS 14.0, tvOS 14, *)
     typealias SectionSnapshot = NSDiffableDataSourceSectionSnapshot<SPDiffableItem>
 }
diff --git a/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+CellProvider.swift b/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+CellProvider.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 extension SPDiffableCollectionDataSource {
     
     open class CellProvider {
@@ -36,6 +36,7 @@ extension SPDiffableCollectionDataSource {
         
         // MARK: - Ready Use
         
+        #if os(iOS)
         @available(iOS 14, *)
         public static var sideBar: [SPDiffableCollectionDataSource.CellProvider]  {
             [sideBarItem, sideBarButton, sideBarHeader]
@@ -82,5 +83,6 @@ extension SPDiffableCollectionDataSource {
                 return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)
             }
         }
+        #endif
     }
 }
diff --git a/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+HeaderFooterProvider.swift b/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+HeaderFooterProvider.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 extension SPDiffableCollectionDataSource {
     
     open class HeaderFooterProvider {
diff --git a/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+UICollectionViewDelegate.swift b/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+UICollectionViewDelegate.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 extension SPDiffableCollectionDataSource: UICollectionViewDelegate {
     
     open func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
diff --git a/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource.swift b/Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterface {
     
     open weak var diffableDelegate: SPDiffableCollectionDelegate?
@@ -106,7 +106,7 @@ open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterfa
         
         // Update items in Sections
         
-        if #available(iOS 14.0, *) {
+        if #available(iOS 14.0, tvOS 14, *) {
             for section in sections {
                 var sectionSnapshot = AppleCollectionDiffableDataSource.SectionSnapshot()
                 
@@ -155,7 +155,7 @@ open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterfa
         // Update snapshot
         
         var snapshot = convertToSnapshot(sections)
-        if #available(iOS 15.0, *) {
+        if #available(iOS 15.0, tvOS 15, *) {
             snapshot.reconfigureItems(items)
         } else {
             snapshot.reloadItems(items)
@@ -165,7 +165,7 @@ open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterfa
     
     public func reconfigure(_ items: [SPDiffableItem]) {
         guard var snapshot = appleDiffableDataSource?.snapshot() else { return }
-        if #available(iOS 15.0, *) {
+        if #available(iOS 15.0, tvOS 15, *) {
             snapshot.reconfigureItems(items)
         } else {
             snapshot.reloadItems(items)
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, *)
+@available(iOS 14, tvOS 14, *)
 open class SPDiffableSideBarButton: SPDiffableActionableItem {
     
     open var title: String
diff --git a/Sources/SPDiffable/Collection/Models/SPDiffableSideBarHeader.swift b/Sources/SPDiffable/Collection/Models/SPDiffableSideBarHeader.swift
@@ -24,7 +24,7 @@ import UIKit
 /**
  SPDiffable: Header model for side bar item.
  */
-@available(iOS 14, *)
+@available(iOS 14, tvOS 14, *)
 open class SPDiffableSideBarHeader: SPDiffableItem {
     
     open 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, *)
+@available(iOS 14, tvOS 14, *)
 open class SPDiffableSideBarItem: SPDiffableActionableItem {
     
     open var title: String
diff --git a/Sources/SPDiffable/Collection/SPDiffableCollectionController.swift b/Sources/SPDiffable/Collection/SPDiffableCollectionController.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 open class SPDiffableCollectionController: UICollectionViewController {
     
     open var diffableDataSource: SPDiffableCollectionDataSource?
diff --git a/Sources/SPDiffable/Collection/SPDiffableCollectionView.swift b/Sources/SPDiffable/Collection/SPDiffableCollectionView.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 open class SPDiffableCollectionView: UICollectionView, UICollectionViewDelegate {
     
     open var diffableDataSource: SPDiffableCollectionDataSource?
diff --git a/Sources/SPDiffable/Collection/SPDiffableSideBarButtonCollectionViewListCell.swift b/Sources/SPDiffable/Collection/SPDiffableSideBarButtonCollectionViewListCell.swift
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if canImport(UIKit) && os(iOS)
 import UIKit
 
 @available(iOS 14, *)
@@ -49,3 +50,4 @@ class SPDiffableSideBarButtonCollectionViewListCell: UICollectionViewListCell {
         didSet { if isSelected { isSelected = false } }
     }
 }
+#endif
diff --git a/Sources/SPDiffable/Collection/SPDiffableSideBarController.swift b/Sources/SPDiffable/Collection/SPDiffableSideBarController.swift
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if canImport(UIKit) && os(iOS)
 import UIKit
 
 @available(iOS 14, *)
@@ -53,3 +54,4 @@ open class SPDiffableSideBarController: SPDiffableCollectionController {
         }
     }
 }
+#endif
diff --git a/Sources/SPDiffable/Table/Cells/SPDiffableTableViewCell.swift b/Sources/SPDiffable/Table/Cells/SPDiffableTableViewCell.swift
@@ -41,6 +41,6 @@ open class SPDiffableTableViewCell: UITableViewCell {
     
     open override func sizeThatFits(_ size: CGSize) -> CGSize {
         let superSize = super.sizeThatFits(size)
-        return .init(width: superSize.width, height: superSize.height + 4)
+        return .init(width: superSize.width, height: superSize.height)
     }
 }
diff --git a/Sources/SPDiffable/Table/Cells/Views/SPDiffableSlider.swift b/Sources/SPDiffable/Table/Cells/Views/SPDiffableSlider.swift
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if canImport(UIKit) && os(iOS)
 import UIKit
 
 open class SPDiffableSlider: UISlider {
@@ -40,3 +41,5 @@ open class SPDiffableSlider: UISlider {
         action(Double(value))
     }
 }
+#endif
+
diff --git a/Sources/SPDiffable/Table/Cells/Views/SPDiffableStepper.swift b/Sources/SPDiffable/Table/Cells/Views/SPDiffableStepper.swift
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if canImport(UIKit) && os(iOS)
 import UIKit
 
 open class SPDiffableStepper: UIStepper {
@@ -40,3 +41,4 @@ open class SPDiffableStepper: UIStepper {
         action(value)
     }
 }
+#endif
diff --git a/Sources/SPDiffable/Table/Cells/Views/SPDiffableSwitch.swift b/Sources/SPDiffable/Table/Cells/Views/SPDiffableSwitch.swift
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if canImport(UIKit) && os(iOS)
 import UIKit
 
 open class SPDiffableSwitch: UISwitch {
@@ -39,3 +40,4 @@ open class SPDiffableSwitch: UISwitch {
         action(isOn)
     }
 }
+#endif
diff --git a/Sources/SPDiffable/Table/DataSource/AppleTableDiffableDataSource.swift b/Sources/SPDiffable/Table/DataSource/AppleTableDiffableDataSource.swift
@@ -21,7 +21,7 @@
 
 import UIKit
 
-@available(iOS 13.0, *)
+@available(iOS 13.0, tvOS 13, *)
 class AppleTableDiffableDataSource: UITableViewDiffableDataSource<SPDiffableSection, SPDiffableItem> {
     
     weak var mediator: SPDiffableTableMediator?
diff --git a/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+CellProvider.swift b/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+CellProvider.swift
diff --git a/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+HeaderFooterProvider.swift b/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+HeaderFooterProvider.swift
diff --git a/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+UITableViewDelegate.swift b/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+UITableViewDelegate.swift
diff --git a/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource.swift b/Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource.swift
diff --git a/Sources/SPDiffable/Table/SPDiffableTableController.swift b/Sources/SPDiffable/Table/SPDiffableTableController.swift

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`import UIKit`
`23`	`23`
`24`		`-@available(iOS 13.0, *)`
	`24`	`+@available(iOS 13.0, tvOS 13, *)`
`25`	`25`	`extension SPDiffableCollectionDataSource {`
`26`	`26`
`27`	`27`	`open class CellProvider {`
`@@ -36,6 +36,7 @@ extension SPDiffableCollectionDataSource {`
`36`	`36`
`37`	`37`	`// MARK: - Ready Use`
`38`	`38`
	`39`	`+ #if os(iOS)`
`39`	`40`	`@available(iOS 14, *)`
`40`	`41`	`public static var sideBar: [SPDiffableCollectionDataSource.CellProvider] {`
`41`	`42`	`[sideBarItem, sideBarButton, sideBarHeader]`
`@@ -82,5 +83,6 @@ extension SPDiffableCollectionDataSource {`
`82`	`83`	`return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)`
`83`	`84`	`}`
`84`	`85`	`}`
	`86`	`+ #endif`
`85`	`87`	`}`
`86`	`88`	`}`