Fix tvOS support

oversizedev · May 19, 2024 · da6e9b6 · da6e9b6
1 parent 502b879
commit da6e9b6
Show file tree

Hide file tree

Showing 23 changed files with 1,500 additions and 1,418 deletions.
diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml
@@ -3,9 +3,6 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - develop
   workflow_dispatch:
 
 jobs:
@@ -14,7 +11,15 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-swiftpm.yml@main
     strategy:
       matrix:
-        packages: [OversizeKit, OversizeCalendarKit, OversizeContactsKit, OversizeLocationKit, OversizeNoticeKit, OversizeNotificationKit, OversizeOnboardingKit, OversizePhotoKit]
+        packages:
+          - OversizeKit
+          - OversizeCalendarKit
+          - OversizeContactsKit
+          - OversizeLocationKit
+          - OversizeNoticeKit
+          - OversizeNotificationKit
+          - OversizeOnboardingKit
+          - OversizePhotoKit
     with:
       package: ${{ matrix.packages }}
     secrets: inherit
@@ -25,7 +30,11 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main
     strategy:
       matrix:
-        destination: ['platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2', 'platform=iOS Simulator,name=iPad Pro (12.9-inch) (6th generation),OS=17.2']
+        destination:
+          - platform=iOS Simulator,name=iPhone 15 Pro,OS=17.5
+          - platform=iOS Simulator,name=iPad Pro (12.9-inch) (6th generation),OS=17.5
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=17.5
+          - platform=watchOS Simulator,name=Apple Watch SE (44mm) (2nd generation),OS=10.5
     with:
       path: AppExample/Example
       scheme: Example

diff --git a/.github/workflows/ci-push.yml b/.github/workflows/ci-push.yml
@@ -8,13 +8,20 @@ on:
   workflow_dispatch:
 
 jobs:
-
   build-swiftpm:
     name: Build SwiftPM
     uses: oversizedev/GithubWorkflows/.github/workflows/build-swiftpm.yml@main
     strategy:
       matrix:
-        packages: [OversizeKit, OversizeCalendarKit, OversizeContactsKit, OversizeLocationKit, OversizeNoticeKit, OversizeNotificationKit, OversizeOnboardingKit, OversizePhotoKit]
+        packages:
+          - OversizeKit
+          - OversizeCalendarKit
+          - OversizeContactsKit
+          - OversizeLocationKit
+          - OversizeNoticeKit
+          - OversizeNotificationKit
+          - OversizeOnboardingKit
+          - OversizePhotoKit
     with:
       package: ${{ matrix.packages }}
     secrets: inherit
@@ -25,7 +32,11 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main
     strategy:
       matrix:
-        destination: ['platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2', 'platform=iOS Simulator,name=iPad Pro (12.9-inch) (6th generation),OS=17.2']
+        destination:
+          - platform=iOS Simulator,name=iPhone 15 Pro,OS=17.5
+          - platform=iOS Simulator,name=iPad Pro (12.9-inch) (6th generation),OS=17.5
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=17.5
+          - platform=watchOS Simulator,name=Apple Watch SE (44mm) (2nd generation),OS=10.5
     with:
       path: AppExample/Example
       scheme: Example

diff --git a/AppExample/Example.xcodeproj/project.pbxproj b/AppExample/Example.xcodeproj/project.pbxproj
@@ -437,12 +437,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.oversize.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3";
+				TVOS_DEPLOYMENT_TARGET = 17.0;
 			};
 			name = Debug;
 		};
@@ -468,12 +473,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.oversize.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3";
+				TVOS_DEPLOYMENT_TARGET = 17.0;
 			};
 			name = Release;
 		};

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AppExample/Example/ExampleApp.swift b/AppExample/Example/ExampleApp.swift
@@ -97,13 +97,15 @@ struct ExampleApp: App {
                     .environmentObject(appSettingsViewModel)
                     .systemServices()
             }
+            #if os(iOS)
             .fullScreenCover(item: $router.fullScreenCover) { fullScreenCover in
                 router.resolve(pathItem: fullScreenCover)
                     .hud(router.hudText, isPresented: $router.isShowHud)
                     .alert(item: $router.alert) { $0.alert }
                     .environmentObject(appSettingsViewModel)
                     .systemServices()
             }
+            #endif
             .alert(item: $router.alert) { $0.alert }
             .onOpenURL { router.handle($0) }
             .environmentObject(router)