Merge pull request #199 from surfstudio/hotfix/tv_example

NullIsOne · web-flow · commit 57e65b9c9ca0 · 2022-10-18T15:57:19.000+04:00
Hotfix/tv example
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -10,7 +10,7 @@ on:
 jobs:
 
   build_iOS:
-    runs-on: macOS-latest
+    runs-on: macOS-12
     steps:
     - uses: actions/checkout@v1
     - name: Generate projects
@@ -33,7 +33,7 @@ jobs:
 
 
   build_Example:
-    runs-on: macOS-latest
+    runs-on: macOS-12
     steps:
     - uses: actions/checkout@v1
     - name: Generate projects
@@ -55,10 +55,12 @@ jobs:
         verbose: true
 
   build_tvOS:
-    runs-on: macOS-latest
+    runs-on: macOS-12
     steps:
     - uses: actions/checkout@v1
     - name: Generate projects
       run: make init
-    - name: Build
+    - name: Build lib
       run: make build_lib_tvOS
+    - name: Build example
+      run: make build_example_tvOS
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
@@ -2,16 +2,16 @@
   "entries": {
     "tap": {
       "homebrew/cask": {
-        "revision": "176a5a8926f71940385fb1ee0532e29e2b805760"
+        "revision": "49a1cf9695aeafce09b6566a6f0ab6b062a03566"
       },
       "yonaskolb/xcodegen": {
-        "revision": "f65dad76252a876eae19ce72ea3649f95401e084",
+        "revision": "87d7c7e136caf6392738096dae0568355a0619e3",
         "options": {
           "clone_target": "https://github.com/yonaskolb/XcodeGen.git"
         }
       },
       "krzysztofzablocki/sourcery": {
-        "revision": "071a7b552de7abde56095667db7e9bda1d189444",
+        "revision": "544b639edb9a75b71d773cc5ae7e2c77173aaf34",
         "options": {
           "clone_target": "https://github.com/krzysztofzablocki/Sourcery.git"
         }
@@ -26,57 +26,47 @@
           "files": {
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:f76deffe6ad019b5004774c27175af44d1e2a17f2bb932e3053c43338f4dc9e2",
-              "sha256": "f76deffe6ad019b5004774c27175af44d1e2a17f2bb932e3053c43338f4dc9e2"
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:22d97109850126936386bc38a22459d9e8ac3ba1e00b254f5149e954f543c2ec",
+              "sha256": "22d97109850126936386bc38a22459d9e8ac3ba1e00b254f5149e954f543c2ec"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:1dfbd86106c388ca72308a0b96f02140030767279bb2c1789e4e8d8f8aac0437",
-              "sha256": "1dfbd86106c388ca72308a0b96f02140030767279bb2c1789e4e8d8f8aac0437"
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:ab30a37ef8e3c885b1cd05c30a844612237f52308556256cb4698784d00a2ad4",
+              "sha256": "ab30a37ef8e3c885b1cd05c30a844612237f52308556256cb4698784d00a2ad4"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:b1aeb953a94bd3bf0e32365c9f7eb52e75d4340f2ff2e2298ae6a822f87b12b7",
-              "sha256": "b1aeb953a94bd3bf0e32365c9f7eb52e75d4340f2ff2e2298ae6a822f87b12b7"
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:6ef4431936bc868e8026c9ddb8396fa5ac2d9d53a611a59b23fc081d3a5ad0bb",
+              "sha256": "6ef4431936bc868e8026c9ddb8396fa5ac2d9d53a611a59b23fc081d3a5ad0bb"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:f5032654ab7d638460ff819699fc5822039482e307c3f68dcb31146106b98ef8",
-              "sha256": "f5032654ab7d638460ff819699fc5822039482e307c3f68dcb31146106b98ef8"
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:4c990bf05734cbb192171079d69e996837092603985c41904ddec799aa51fcbe",
+              "sha256": "4c990bf05734cbb192171079d69e996837092603985c41904ddec799aa51fcbe"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:9b7a3ab693384e83bed188f1bef6b7bf1bca6025affb9d9890aecf7973552b12",
-              "sha256": "9b7a3ab693384e83bed188f1bef6b7bf1bca6025affb9d9890aecf7973552b12"
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:330bf63ef11b30bde8f32aea2d46604fd16bcfcff1b918ab95fe294ea9f3708a",
+              "sha256": "330bf63ef11b30bde8f32aea2d46604fd16bcfcff1b918ab95fe294ea9f3708a"
             }
           }
         }
       },
       "sourcery": {
-        "version": "1.8.1",
+        "version": "1.9.0",
         "bottle": {
           "rebuild": 0,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:df19b1c5f921b36473c9de0cae013e705a796b2e4d439ea9cc1b43a1df4199bd",
-              "sha256": "df19b1c5f921b36473c9de0cae013e705a796b2e4d439ea9cc1b43a1df4199bd"
-            },
-            "arm64_big_sur": {
-              "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:59234183803f8dc23797334a4f995a037e68ca51faf9f6242da18b0892f85f82",
-              "sha256": "59234183803f8dc23797334a4f995a037e68ca51faf9f6242da18b0892f85f82"
+              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:0f8ad70cf4d9dba61f8621513dc8db1c25bcee74c0a2da3a1013763e37add80c",
+              "sha256": "0f8ad70cf4d9dba61f8621513dc8db1c25bcee74c0a2da3a1013763e37add80c"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:5d93cb5bf7a3adc4dba8ea972fb9347190cd04238efcd60942192c56c096cbb6",
-              "sha256": "5d93cb5bf7a3adc4dba8ea972fb9347190cd04238efcd60942192c56c096cbb6"
-            },
-            "big_sur": {
-              "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:92cb87ac0c373bd0ad1111d388916c86f4fcdd390686143b2ddff85a664f1b7a",
-              "sha256": "92cb87ac0c373bd0ad1111d388916c86f4fcdd390686143b2ddff85a664f1b7a"
+              "url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:9cc7c91be67833c608e94ec72d57531a86953318e97ec751bcaf86daf798c263",
+              "sha256": "9cc7c91be67833c608e94ec72d57531a86953318e97ec751bcaf86daf798c263"
             }
           }
         }
@@ -86,12 +76,12 @@
   "system": {
     "macos": {
       "monterey": {
-        "HOMEBREW_VERSION": "3.5.4-32-g8dd96ae",
+        "HOMEBREW_VERSION": "3.6.6-6-g4737289",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "ffef759c267ea84897d1e291698e8615653528ee",
-        "CLT": "13.0.0.0.1.1627064638",
+        "Homebrew/homebrew-core": "76200ff370469c6f5f8d1a1684ff259cf9337ac6",
+        "CLT": "14.1.0.0.1.1662869207",
         "Xcode": "13.4.1",
-        "macOS": "12.4"
+        "macOS": "12.6"
       },
       "big_sur": {
         "HOMEBREW_VERSION": "3.5.2",
diff --git a/Example/ReactiveDataDisplayManager/Application/Info.plist b/Example/ReactiveDataDisplayManager/Application/Info.plist
@@ -23,6 +23,6 @@
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIUserInterfaceStyle</key>
-	<string>light</string>
+	<string>Light</string>
 </dict>
 </plist>
diff --git a/Example/ReactiveDataDisplayManagerExampleTv/Application/Info.plist b/Example/ReactiveDataDisplayManagerExampleTv/Application/Info.plist
@@ -23,6 +23,6 @@
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIUserInterfaceStyle</key>
-	<string>light</string>
+	<string>Light</string>
 </dict>
 </plist>
diff --git a/Example/ReactiveDataDisplayManagerExampleTv/Collection/CollectionDefaultBehavoirController.swift b/Example/ReactiveDataDisplayManagerExampleTv/Collection/CollectionDefaultBehavoirController.swift
@@ -7,6 +7,7 @@
 //
 
 import Nuke
+import UIKit
 import ReactiveDataDisplayManager
 
 final class CollectionDefaultBehavoirController: UIViewController {
diff --git a/Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/ImageDefaultBehavoirCell/ImageDefaultBehavoirCollectionViewCell.swift b/Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/ImageDefaultBehavoirCell/ImageDefaultBehavoirCollectionViewCell.swift
@@ -6,6 +6,7 @@
 //  
 //
 
+import UIKit
 import ReactiveDataDisplayManager
 
 final class ImageDefaultBehavoirCollectionViewCell: UICollectionViewCell {
diff --git a/Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/TitleTableViewCell/TitleTableViewCell.swift b/Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/TitleTableViewCell/TitleTableViewCell.swift
@@ -7,6 +7,7 @@
 //
 
 import ReactiveDataDisplayManager
+import UIKit
 
 final class TitleTableViewCell: UITableViewCell {
 
diff --git a/Example/targets/template.yml b/Example/targets/template.yml
@@ -13,7 +13,7 @@ targetTemplates:
         - sdk: UIKit.framework
       info:
         properties:
-          UIUserInterfaceStyle: light
+          UIUserInterfaceStyle: Light
           UILaunchStoryboardName: LaunchScreen
           UIMainStoryboardFile: Main
           CFBundleName: ${bundle_name}
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,14 +3,14 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.6)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -64,15 +64,15 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    minitest (5.16.2)
+    minitest (5.16.3)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     public_suffix (4.0.7)
     racc (1.6.0)
@@ -87,7 +87,7 @@ GEM
       xcodeproj (~> 1.21)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -98,7 +98,7 @@ GEM
       rexml (~> 3.2.4)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   x86_64-darwin-21
diff --git a/Makefile b/Makefile
@@ -22,10 +22,11 @@ projects:
 
 ## Build Configuration
 destination='platform=iOS Simulator,name=iPhone 8'
+destination_tv='platform=tvOS Simulator,name=Apple TV'
 
 ## Build lib sources for **tvOS** platform
 build_lib_tvOS:
-	xcodebuild -scheme ReactiveDataDisplayManager_tvOS -sdk iphonesimulator -destination 'platform=tvOS Simulator,name=Apple TV'
+	xcodebuild -scheme ReactiveDataDisplayManager_tvOS -sdk appletvsimulator -destination ${destination_tv}
 
 ## Build lib sources for **iOS** platform (produce xctestrun)
 build_lib_iOS:
@@ -39,6 +40,10 @@ test_lib_iOS:
 prepare_report:
 	bundle exec slather
 
+## Build Example sources for **tvOS** platform
+build_example_tvOS:
+	xcodebuild -workspace ReactiveDataDisplayManager.xcworkspace -scheme ReactiveDataDisplayManagerExample_tvOS -sdk appletvsimulator -destination ${destination_tv}
+
 ## Build Example sources for **iOS** platform (produce xctestrun)
 build_example_iOS:
 	xcodebuild -workspace ReactiveDataDisplayManager.xcworkspace -scheme ReactiveDataDisplayManagerExample_iOS -sdk iphonesimulator -destination ${destination} build-for-testing
diff --git a/Podfile b/Podfile
@@ -1,25 +1,30 @@
 use_frameworks!
 
-$NukeRepository = "https://github.com/kean/Nuke.git"
-$NukeTag = "9.5.1"
-
 def utils
   pod 'SurfUtils/ItemsScrollManager', :git => "https://github.com/surfstudio/iOS-Utils.git", :tag => '11.0.0'
+end
+
+def diffKit
   pod 'DifferenceKit', '1.1.5'
-  pod 'Nuke', :git => $NukeRepository, :tag => $NukeTag
+end
+
+def nuke
+  pod 'Nuke', :git => "https://github.com/kean/Nuke.git", :tag => "10.11.2"
 end
 
 abstract_target 'Targets' do
-  platform :ios, '11.0'
-  utils
+
+  nuke
 
   target 'ReactiveDataDisplayManagerExample_iOS' do
+    platform :ios, '11.0'
+    utils
+    diffKit
     target 'ReactiveDataDisplayManagerExampleUITests'
   end
-  
-end
 
-target 'ReactiveDataDisplayManagerExample_tvOS' do
-  platform :ios, '13.0'
-  pod 'Nuke', :git => $NukeRepository, :tag => $NukeTag
+  target 'ReactiveDataDisplayManagerExample_tvOS' do
+    platform :tvos, '13.0'
+  end
+
 end
diff --git a/ReactiveDataDisplayManagerTests/Mocks/AutoMockable.generated.swift b/ReactiveDataDisplayManagerTests/Mocks/AutoMockable.generated.swift
@@ -1,4 +1,4 @@
-// Generated using Sourcery 1.8.1 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 1.9.0 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
 // swiftlint:disable all
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Generated using Sourcery 1.8.1 — https://github.com/krzysztofzablocki/Sourcery`
	`1`	`+// Generated using Sourcery 1.9.0 — https://github.com/krzysztofzablocki/Sourcery`
`2`	`2`	`// DO NOT EDIT`
`3`	`3`	`// swiftlint:disable all`
`4`	`4`