From 089684ee5604a6a2a15a4fc03fe63c73a5de9fd0 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Fri, 28 Oct 2022 02:50:49 -0700 Subject: [PATCH] Remove remaining TV_OS fragments (#35110) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/35110 Changelog: [General][Fixed] Remove remaining TV_OS fragments Reviewed By: shwanton Differential Revision: D40775881 fbshipit-source-id: 122ff8737de35689ee0951b068997ee546c7019c --- ReactCommon/cxxreact/React-cxxreact.podspec | 2 +- ReactCommon/logger/React-logger.podspec | 2 +- ReactCommon/react/renderer/graphics/React-graphics.podspec | 2 +- .../rn-tester/NativeComponentExample/MyNativeView.podspec | 2 +- .../rn-tester/NativeModuleExample/ScreenshotManager.podspec | 2 +- .../RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m | 3 --- packages/rn-tester/RCTTest/RCTTestRunner.m | 4 ---- packages/rn-tester/RCTTest/React-RCTTest.podspec | 2 +- third-party-podspecs/RCT-Folly.podspec | 2 +- third-party-podspecs/boost.podspec | 2 +- 10 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index c4498e9d3f1..8888f854733 100644 --- 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 index 62b5148965a..193f42e2315 100644 --- 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 index 3f7ff0da5be..8c297d76b43 100644 --- 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 index 25defc71376..3368c3e47c0 100644 --- 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 index 49e75393a61..339f68e1d41 100644 --- 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 index 3aefe13faf7..48d51fa5299 100644 --- a/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m +++ b/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m @@ -241,9 +241,6 @@ typedef NS_ENUM(NSInteger, FBTestSnapshotFileNameType) { 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 index 7f95689af57..d373afe1976 100644 --- a/packages/rn-tester/RCTTest/RCTTestRunner.m +++ b/packages/rn-tester/RCTTest/RCTTestRunner.m @@ -196,11 +196,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init) 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 index f6836ca2fa1..5f6d58f908e 100644 --- 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 index 02e47ea2585..ec097f63d10 100644 --- 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 index 2f1fcc4b5ef..3d9331c95d1 100644 --- 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'