Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove remaining TV_OS fragments #35110

Closed
wants to merge 1 commit into from
Closed

Remove remaining TV_OS fragments #35110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReactCommon/cxxreact/React-cxxreact.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/logger/React-logger.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/graphics/React-graphics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/NativeComponentExample/MyNativeView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" }
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" }
Expand Down
3 changes: 0 additions & 3 deletions packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 0 additions & 4 deletions packages/rn-tester/RCTTest/RCTTestRunner.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/RCTTest/React-RCTTest.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion third-party-podspecs/RCT-Folly.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion third-party-podspecs/boost.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down