Remove remaining TV_OS fragments (#35110)

Summary: Pull Request resolved: #35110 Changelog: [General][Fixed] Remove remaining TV_OS fragments Reviewed By: shwanton Differential Revision: D40775881 fbshipit-source-id: 122ff8737de35689ee0951b068997ee546c7019c
facebook · Oct 28, 2022 · 089684e · 089684e
1 parent 76f7084
commit 089684e
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 15 deletions.
diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"

diff --git a/ReactCommon/logger/React-logger.podspec b/ReactCommon/logger/React-logger.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"

diff --git a/ReactCommon/react/renderer/graphics/React-graphics.podspec b/ReactCommon/react/renderer/graphics/React-graphics.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = "**/*.{m,mm,cpp,h}"

diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.description     = "my-native-view"
   s.homepage        = "https://github.com/sota000/my-native-view.git"
   s.license         = "MIT"
-  s.platforms       = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms       = { :ios => "12.4" }
   s.compiler_flags  = boost_compiler_flags + ' -Wno-nullability-completeness'
   s.author          = "Facebook, Inc. and its affiliates"
   s.source          = { :git => "https://github.com/facebook/my-native-view.git", :tag => "#{s.version}" }

diff --git a/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec b/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.description     = "ScreenshotManager"
   s.homepage        = "https://github.com/facebook/react-native.git"
   s.license         = "MIT"
-  s.platforms       = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms       = { :ios => "12.4" }
   s.compiler_flags  = '-Wno-nullability-completeness'
   s.author          = "Facebook, Inc. and its affiliates"
   s.source          = { :git => "https://github.com/facebook/react-native.git", :tag => "#{s.version}" }

diff --git a/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m b/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
@@ -241,9 +241,6 @@ - (NSString *)_fileNameForSelector:(SEL)selector
   if ([[UIScreen mainScreen] scale] > 1.0) {
     fileName = [fileName stringByAppendingFormat:@"@%.fx", [[UIScreen mainScreen] scale]];
   }
-#if TARGET_OS_TV
-  fileName = [fileName stringByAppendingString:@"_tvOS"];
-#endif
   fileName = [fileName stringByAppendingPathExtension:@"png"];
   return fileName;
 }

diff --git a/packages/rn-tester/RCTTest/RCTTestRunner.m b/packages/rn-tester/RCTTest/RCTTestRunner.m
@@ -196,11 +196,7 @@ - (void)runTest:(SEL)test
       RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                        moduleName:moduleName
                                                 initialProperties:initialProps];
-#if TARGET_OS_TV
-      rootView.frame = CGRectMake(0, 0, 1920, 1080); // Standard screen size for tvOS
-#else
       rootView.frame = CGRectMake(0, 0, 320, 2000); // Constant size for testing on multiple devices
-#endif
 
       rootTag = rootView.reactTag;
       testModule.view = rootView;

diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{h,m,mm}"

diff --git a/third-party-podspecs/RCT-Folly.podspec b/third-party-podspecs/RCT-Folly.podspec
@@ -152,5 +152,5 @@ Pod::Spec.new do |spec|
 
   # Folly has issues when compiled with iOS 10 set as deployment target
   # See https://github.com/facebook/folly/issues/1470 for details
-  spec.platforms = { :ios => "9.0", :tvos => "9.0" }
+  spec.platforms = { :ios => "9.0" }
 end
diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
                   :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' }
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => '11.0', :tvos => '11.0' }
+  spec.platforms = { :ios => '11.0' }
   spec.requires_arc = false
 
   spec.module_name = 'boost'