Remove tvOS support as Speech not present there

StanfordSpezi · Feb 24, 2024 · 473a15a · 473a15a
1 parent 0211fd1
commit 473a15a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 32 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -41,11 +41,11 @@ jobs:
       matrix:
         include:
           - buildConfig: Debug
-            artifactname: SpeziSpeech-iOS.xcresult
-            resultBundle: SpeziSpeech-iOS.xcresult
+            artifactname: SpeziSpeech-watchOS.xcresult
+            resultBundle: SpeziSpeech-watchOS.xcresult
           - buildConfig: Release
-            artifactname: SpeziSpeech-iOS-Release.xcresult
-            resultBundle: SpeziSpeech-iOS-Release.xcresult
+            artifactname: SpeziSpeech-watchOS-Release.xcresult
+            resultBundle: SpeziSpeech-watchOS-Release.xcresult
     with:
       runsonlabels: '["macOS", "self-hosted"]'
       scheme: SpeziSpeech-Package
@@ -72,25 +72,6 @@ jobs:
       buildConfig: ${{ matrix.buildConfig }}
       resultBundle: ${{ matrix.resultBundle }}
       artifactname: ${{ matrix.artifactname }}
-  buildandtest_tvos:
-    name: Build and Test Swift Package tvOS
-    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
-    strategy:
-      matrix:
-        include:
-          - buildConfig: Debug
-            artifactname: SpeziSpeech-visionOS.xcresult
-            resultBundle: SpeziSpeech-visionOS.xcresult
-          - buildConfig: Release
-            artifactname: SpeziSpeech-visionOS-Release.xcresult
-            resultBundle: SpeziSpeech-visionOS-Release.xcresult
-    with:
-      runsonlabels: '["macOS", "self-hosted"]'
-      scheme: SpeziSpeech-Package
-      destination: 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation)'
-      buildConfig: ${{ matrix.buildConfig }}
-      resultBundle: ${{ matrix.resultBundle }}
-      artifactname: ${{ matrix.artifactname }}
   buildandtest_macos:
     name: Build and Test Swift Package macOS
     uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -174,4 +155,4 @@ jobs:
     needs: [buildandtest_ios, buildandtest_visionos, buildandtest_watchos, buildandtest_macos, buildandtestuitests_ios, buildandtestuitests_ipad, buildandtestuitests_visionos]
     uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2
     with:
-      coveragereports: 'SpeziSpeech-iOS.xcresult SpeziViews-watchOS.xcresult SpeziSpeech-visionOS.xcresult buildandtest_tvos SpeziSpeech-macOS.xcresult TestApp-iOS.xcresult TestApp-iPad.xcresult TestApp-visionOS.xcresult'
+      coveragereports: 'SpeziSpeech-iOS.xcresult SpeziViews-watchOS.xcresult SpeziSpeech-visionOS.xcresult SpeziSpeech-macOS.xcresult TestApp-iOS.xcresult TestApp-iPad.xcresult TestApp-visionOS.xcresult'
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,6 @@ let package = Package(
     platforms: [
         .iOS(.v17),
         .visionOS(.v1),
-        .tvOS(.v17),
         .watchOS(.v10),
         .macOS(.v14)
     ],

diff --git a/Tests/UITests/TestApp/SpeechTestView.swift b/Tests/UITests/TestApp/SpeechTestView.swift
@@ -26,7 +26,7 @@ struct SpeechTestView: View {
                     .padding()
             }
                 .frame(
-                    width: 500,
+                    width: 350,
                     height: 200
                 )
                 .border(.gray)

diff --git a/Tests/UITests/UITests.xcodeproj/project.pbxproj b/Tests/UITests/UITests.xcodeproj/project.pbxproj
@@ -401,14 +401,14 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.speech.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,3,7";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Debug;
 		};
@@ -440,14 +440,14 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.speech.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,3,7";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Release;
 		};
@@ -593,14 +593,14 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.speech.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,3,7";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Test;
 		};