Skip to content

Commit 57e65b9

Browse files
NullIsOneNullIsOne
authored
Merge pull request #199 from surfstudio/hotfix/tv_example
Hotfix/tv example
2 parents 6237c21 + 592cf39 commit 57e65b9

File tree

12 files changed

+65
-60
lines changed

12 files changed

+65
-60
lines changed

‎.github/workflows/Build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111

1212
build_iOS:
13-
runs-on: macOS-latest
13+
runs-on: macOS-12
1414
steps:
1515
- uses: actions/checkout@v1
1616
- name: Generate projects
@@ -33,7 +33,7 @@ jobs:
3333

3434

3535
build_Example:
36-
runs-on: macOS-latest
36+
runs-on: macOS-12
3737
steps:
3838
- uses: actions/checkout@v1
3939
- name: Generate projects
@@ -55,10 +55,12 @@ jobs:
5555
verbose: true
5656

5757
build_tvOS:
58-
runs-on: macOS-latest
58+
runs-on: macOS-12
5959
steps:
6060
- uses: actions/checkout@v1
6161
- name: Generate projects
6262
run: make init
63-
- name: Build
63+
- name: Build lib
6464
run: make build_lib_tvOS
65+
- name: Build example
66+
run: make build_example_tvOS

‎Brewfile.lock.json‎

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"entries": {
33
"tap": {
44
"homebrew/cask": {
5-
"revision": "176a5a8926f71940385fb1ee0532e29e2b805760"
5+
"revision": "49a1cf9695aeafce09b6566a6f0ab6b062a03566"
66
},
77
"yonaskolb/xcodegen": {
8-
"revision": "f65dad76252a876eae19ce72ea3649f95401e084",
8+
"revision": "87d7c7e136caf6392738096dae0568355a0619e3",
99
"options": {
1010
"clone_target": "https://github.com/yonaskolb/XcodeGen.git"
1111
}
1212
},
1313
"krzysztofzablocki/sourcery": {
14-
"revision": "071a7b552de7abde56095667db7e9bda1d189444",
14+
"revision": "544b639edb9a75b71d773cc5ae7e2c77173aaf34",
1515
"options": {
1616
"clone_target": "https://github.com/krzysztofzablocki/Sourcery.git"
1717
}
@@ -26,57 +26,47 @@
2626
"files": {
2727
"arm64_monterey": {
2828
"cellar": ":any_skip_relocation",
29-
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:f76deffe6ad019b5004774c27175af44d1e2a17f2bb932e3053c43338f4dc9e2",
30-
"sha256": "f76deffe6ad019b5004774c27175af44d1e2a17f2bb932e3053c43338f4dc9e2"
29+
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:22d97109850126936386bc38a22459d9e8ac3ba1e00b254f5149e954f543c2ec",
30+
"sha256": "22d97109850126936386bc38a22459d9e8ac3ba1e00b254f5149e954f543c2ec"
3131
},
3232
"arm64_big_sur": {
3333
"cellar": ":any_skip_relocation",
34-
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:1dfbd86106c388ca72308a0b96f02140030767279bb2c1789e4e8d8f8aac0437",
35-
"sha256": "1dfbd86106c388ca72308a0b96f02140030767279bb2c1789e4e8d8f8aac0437"
34+
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:ab30a37ef8e3c885b1cd05c30a844612237f52308556256cb4698784d00a2ad4",
35+
"sha256": "ab30a37ef8e3c885b1cd05c30a844612237f52308556256cb4698784d00a2ad4"
3636
},
3737
"monterey": {
3838
"cellar": ":any_skip_relocation",
39-
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:b1aeb953a94bd3bf0e32365c9f7eb52e75d4340f2ff2e2298ae6a822f87b12b7",
40-
"sha256": "b1aeb953a94bd3bf0e32365c9f7eb52e75d4340f2ff2e2298ae6a822f87b12b7"
39+
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:6ef4431936bc868e8026c9ddb8396fa5ac2d9d53a611a59b23fc081d3a5ad0bb",
40+
"sha256": "6ef4431936bc868e8026c9ddb8396fa5ac2d9d53a611a59b23fc081d3a5ad0bb"
4141
},
4242
"big_sur": {
4343
"cellar": ":any_skip_relocation",
44-
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:f5032654ab7d638460ff819699fc5822039482e307c3f68dcb31146106b98ef8",
45-
"sha256": "f5032654ab7d638460ff819699fc5822039482e307c3f68dcb31146106b98ef8"
44+
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:4c990bf05734cbb192171079d69e996837092603985c41904ddec799aa51fcbe",
45+
"sha256": "4c990bf05734cbb192171079d69e996837092603985c41904ddec799aa51fcbe"
4646
},
4747
"catalina": {
4848
"cellar": ":any_skip_relocation",
49-
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:9b7a3ab693384e83bed188f1bef6b7bf1bca6025affb9d9890aecf7973552b12",
50-
"sha256": "9b7a3ab693384e83bed188f1bef6b7bf1bca6025affb9d9890aecf7973552b12"
49+
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:330bf63ef11b30bde8f32aea2d46604fd16bcfcff1b918ab95fe294ea9f3708a",
50+
"sha256": "330bf63ef11b30bde8f32aea2d46604fd16bcfcff1b918ab95fe294ea9f3708a"
5151
}
5252
}
5353
}
5454
},
5555
"sourcery": {
56-
"version": "1.8.1",
56+
"version": "1.9.0",
5757
"bottle": {
5858
"rebuild": 0,
5959
"root_url": "https://ghcr.io/v2/homebrew/core",
6060
"files": {
6161
"arm64_monterey": {
6262
"cellar": ":any_skip_relocation",
63-
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:df19b1c5f921b36473c9de0cae013e705a796b2e4d439ea9cc1b43a1df4199bd",
64-
"sha256": "df19b1c5f921b36473c9de0cae013e705a796b2e4d439ea9cc1b43a1df4199bd"
65-
},
66-
"arm64_big_sur": {
67-
"cellar": ":any_skip_relocation",
68-
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:59234183803f8dc23797334a4f995a037e68ca51faf9f6242da18b0892f85f82",
69-
"sha256": "59234183803f8dc23797334a4f995a037e68ca51faf9f6242da18b0892f85f82"
63+
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:0f8ad70cf4d9dba61f8621513dc8db1c25bcee74c0a2da3a1013763e37add80c",
64+
"sha256": "0f8ad70cf4d9dba61f8621513dc8db1c25bcee74c0a2da3a1013763e37add80c"
7065
},
7166
"monterey": {
7267
"cellar": ":any_skip_relocation",
73-
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:5d93cb5bf7a3adc4dba8ea972fb9347190cd04238efcd60942192c56c096cbb6",
74-
"sha256": "5d93cb5bf7a3adc4dba8ea972fb9347190cd04238efcd60942192c56c096cbb6"
75-
},
76-
"big_sur": {
77-
"cellar": ":any_skip_relocation",
78-
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:92cb87ac0c373bd0ad1111d388916c86f4fcdd390686143b2ddff85a664f1b7a",
79-
"sha256": "92cb87ac0c373bd0ad1111d388916c86f4fcdd390686143b2ddff85a664f1b7a"
68+
"url": "https://ghcr.io/v2/homebrew/core/sourcery/blobs/sha256:9cc7c91be67833c608e94ec72d57531a86953318e97ec751bcaf86daf798c263",
69+
"sha256": "9cc7c91be67833c608e94ec72d57531a86953318e97ec751bcaf86daf798c263"
8070
}
8171
}
8272
}
@@ -86,12 +76,12 @@
8676
"system": {
8777
"macos": {
8878
"monterey": {
89-
"HOMEBREW_VERSION": "3.5.4-32-g8dd96ae",
79+
"HOMEBREW_VERSION": "3.6.6-6-g4737289",
9080
"HOMEBREW_PREFIX": "/usr/local",
91-
"Homebrew/homebrew-core": "ffef759c267ea84897d1e291698e8615653528ee",
92-
"CLT": "13.0.0.0.1.1627064638",
81+
"Homebrew/homebrew-core": "76200ff370469c6f5f8d1a1684ff259cf9337ac6",
82+
"CLT": "14.1.0.0.1.1662869207",
9383
"Xcode": "13.4.1",
94-
"macOS": "12.4"
84+
"macOS": "12.6"
9585
},
9686
"big_sur": {
9787
"HOMEBREW_VERSION": "3.5.2",

‎Example/ReactiveDataDisplayManager/Application/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<key>UIMainStoryboardFile</key>
2424
<string>Main</string>
2525
<key>UIUserInterfaceStyle</key>
26-
<string>light</string>
26+
<string>Light</string>
2727
</dict>
2828
</plist>

‎Example/ReactiveDataDisplayManagerExampleTv/Application/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<key>UIMainStoryboardFile</key>
2424
<string>Main</string>
2525
<key>UIUserInterfaceStyle</key>
26-
<string>light</string>
26+
<string>Light</string>
2727
</dict>
2828
</plist>

‎Example/ReactiveDataDisplayManagerExampleTv/Collection/CollectionDefaultBehavoirController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import Nuke
10+
import UIKit
1011
import ReactiveDataDisplayManager
1112

1213
final class CollectionDefaultBehavoirController: UIViewController {

‎Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/ImageDefaultBehavoirCell/ImageDefaultBehavoirCollectionViewCell.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77
//
88

9+
import UIKit
910
import ReactiveDataDisplayManager
1011

1112
final class ImageDefaultBehavoirCollectionViewCell: UICollectionViewCell {

‎Example/ReactiveDataDisplayManagerExampleTv/Views/Cells/TitleTableViewCell/TitleTableViewCell.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import ReactiveDataDisplayManager
10+
import UIKit
1011

1112
final class TitleTableViewCell: UITableViewCell {
1213

‎Example/targets/template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ targetTemplates:
1313
- sdk: UIKit.framework
1414
info:
1515
properties:
16-
UIUserInterfaceStyle: light
16+
UIUserInterfaceStyle: Light
1717
UILaunchStoryboardName: LaunchScreen
1818
UIMainStoryboardFile: Main
1919
CFBundleName: ${bundle_name}

‎Gemfile.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ GEM
33
specs:
44
CFPropertyList (3.0.5)
55
rexml
6-
activesupport (6.1.6)
6+
activesupport (6.1.7)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
1111
zeitwerk (~> 2.3)
12-
addressable (2.8.0)
13-
public_suffix (>= 2.0.2, < 5.0)
12+
addressable (2.8.1)
13+
public_suffix (>= 2.0.2, < 6.0)
1414
algoliasearch (1.27.5)
1515
httpclient (~> 2.8, >= 2.8.3)
1616
json (>= 1.5.1)
@@ -64,15 +64,15 @@ GEM
6464
fuzzy_match (2.0.4)
6565
gh_inspector (1.1.3)
6666
httpclient (2.8.3)
67-
i18n (1.10.0)
67+
i18n (1.12.0)
6868
concurrent-ruby (~> 1.0)
6969
json (2.6.2)
70-
minitest (5.16.2)
70+
minitest (5.16.3)
7171
molinillo (0.8.0)
7272
nanaimo (0.3.0)
7373
nap (1.1.0)
7474
netrc (0.11.0)
75-
nokogiri (1.13.6-x86_64-darwin)
75+
nokogiri (1.13.8-x86_64-darwin)
7676
racc (~> 1.4)
7777
public_suffix (4.0.7)
7878
racc (1.6.0)
@@ -87,7 +87,7 @@ GEM
8787
xcodeproj (~> 1.21)
8888
typhoeus (1.4.0)
8989
ethon (>= 0.9.0)
90-
tzinfo (2.0.4)
90+
tzinfo (2.0.5)
9191
concurrent-ruby (~> 1.0)
9292
xcodeproj (1.22.0)
9393
CFPropertyList (>= 2.3.3, < 4.0)
@@ -98,7 +98,7 @@ GEM
9898
rexml (~> 3.2.4)
9999
xcpretty (0.3.0)
100100
rouge (~> 2.0.7)
101-
zeitwerk (2.6.0)
101+
zeitwerk (2.6.1)
102102

103103
PLATFORMS
104104
x86_64-darwin-21

‎Makefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ projects:
2222

2323
## Build Configuration
2424
destination='platform=iOS Simulator,name=iPhone 8'
25+
destination_tv='platform=tvOS Simulator,name=Apple TV'
2526

2627
## Build lib sources for **tvOS** platform
2728
build_lib_tvOS:
28-
xcodebuild -scheme ReactiveDataDisplayManager_tvOS -sdk iphonesimulator -destination 'platform=tvOS Simulator,name=Apple TV'
29+
xcodebuild -scheme ReactiveDataDisplayManager_tvOS -sdk appletvsimulator -destination ${destination_tv}
2930

3031
## Build lib sources for **iOS** platform (produce xctestrun)
3132
build_lib_iOS:
@@ -39,6 +40,10 @@ test_lib_iOS:
3940
prepare_report:
4041
bundle exec slather
4142

43+
## Build Example sources for **tvOS** platform
44+
build_example_tvOS:
45+
xcodebuild -workspace ReactiveDataDisplayManager.xcworkspace -scheme ReactiveDataDisplayManagerExample_tvOS -sdk appletvsimulator -destination ${destination_tv}
46+
4247
## Build Example sources for **iOS** platform (produce xctestrun)
4348
build_example_iOS:
4449
xcodebuild -workspace ReactiveDataDisplayManager.xcworkspace -scheme ReactiveDataDisplayManagerExample_iOS -sdk iphonesimulator -destination ${destination} build-for-testing

0 commit comments

Comments
 (0)