From 9587c2a74d3b34f7bb75f5d336e623d5f44c1b4d Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Wed, 22 Dec 2021 15:50:49 -0600 Subject: [PATCH] replace all references to 10.14 --- .../React-RCTActionSheet.podspec | 2 +- Libraries/Blob/React-RCTBlob.podspec | 2 +- Libraries/FBLazyVector/FBLazyVector.podspec | 2 +- .../FBReactNativeSpec.podspec | 2 +- Libraries/Image/RCTImageView.mm | 10 +---- Libraries/Image/React-RCTImage.podspec | 2 +- Libraries/LinkingIOS/React-RCTLinking.podspec | 2 +- .../React-RCTAnimation.podspec | 2 +- Libraries/Network/React-RCTNetwork.podspec | 2 +- .../React-RCTPushNotification.podspec | 2 +- Libraries/RCTRequired/RCTRequired.podspec | 2 +- Libraries/Settings/React-RCTSettings.podspec | 2 +- Libraries/Text/React-RCTText.podspec | 2 +- Libraries/TypeSafety/RCTTypeSafety.podspec | 2 +- .../Vibration/React-RCTVibration.podspec | 2 +- README.md | 2 +- React-Core.podspec | 4 +- React.podspec | 2 +- React/Base/macOS/RCTDynamicColor.m | 10 ++--- React/CoreModules/RCTAppearance.mm | 41 ++++++++----------- React/CoreModules/React-CoreModules.podspec | 2 +- ReactCommon/ReactCommon.podspec | 2 +- .../callinvoker/React-callinvoker.podspec | 2 +- ReactCommon/cxxreact/React-cxxreact.podspec | 2 +- ReactCommon/jsi/React-jsi.podspec | 2 +- .../jsiexecutor/React-jsiexecutor.podspec | 2 +- .../jsinspector/React-jsinspector.podspec | 2 +- .../reactperflogger/React-perflogger.podspec | 2 +- .../React-runtimeexecutor.podspec | 2 +- ReactCommon/yoga/Yoga.podspec | 2 +- .../React-TurboModuleCxx-RNW.podspec | 2 +- .../React-TurboModuleCxx-WinRTPort.podspec | 2 +- .../HelloWorld.xcodeproj/project.pbxproj | 4 +- .../generator-macos/templates/macos/Podfile | 2 +- packages/rn-tester/Podfile | 8 ++-- .../rn-tester/RCTTest/React-RCTTest.podspec | 2 +- .../RNTesterPods.xcodeproj/project.pbxproj | 16 ++++---- .../RCTConvert_NSColorTests.m | 38 +++++++---------- third-party-podspecs/DoubleConversion.podspec | 2 +- third-party-podspecs/RCT-Folly.podspec | 2 +- .../boost-for-react-native.podspec | 2 +- third-party-podspecs/glog.podspec | 2 +- third-party-podspecs/libevent.podspec | 2 +- 43 files changed, 90 insertions(+), 111 deletions(-) diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec index c43897e0a3c877..262578fb2d7257 100644 --- a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec +++ b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec @@ -24,7 +24,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/actionsheetios" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index 8522ca699905cb..5ef3cf9b7094e3 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{h,m,mm}" diff --git a/Libraries/FBLazyVector/FBLazyVector.podspec b/Libraries/FBLazyVector/FBLazyVector.podspec index 4ecf18b34ae38e..446743dfe5bfe2 100644 --- a/Libraries/FBLazyVector/FBLazyVector.podspec +++ b/Libraries/FBLazyVector/FBLazyVector.podspec @@ -23,7 +23,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "FBLazyVector" diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec index e0cd597d7cc3d5..83cb10bc2380c0 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec @@ -37,7 +37,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" diff --git a/Libraries/Image/RCTImageView.mm b/Libraries/Image/RCTImageView.mm index 7cbe9a50517a29..ea2783decef9de 100644 --- a/Libraries/Image/RCTImageView.mm +++ b/Libraries/Image/RCTImageView.mm @@ -649,18 +649,12 @@ - (RCTPlatformView *)reactAccessibilityElement - (NSColor *)tintColor { - NSColor *tintColor = nil; - if (@available(macOS 10.14, *)) { - tintColor = _imageView.contentTintColor; - } - return tintColor; + return _imageView.contentTintColor; } - (void)setTintColor:(NSColor *)tintColor { - if (@available(macOS 10.14, *)) { - _imageView.contentTintColor = tintColor; - } + _imageView.contentTintColor = tintColor; } #endif // ]TODO(macOS GH#774) diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index b7e7b7b765bc2d..5f1b130cc2c842 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/image" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index 95fcd9f43b2102..e24b47a06c272e 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/linking" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index 65453a45ae9a8e..cb9940f63ced58 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "{Drivers/*,Nodes/*,*}.{m,mm}" diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index c7b5acfc76d3bb..70f4fa1ee4ace2 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 97e419d1f1e7f8..4952935ae27093 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/pushnotificationios" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/Libraries/RCTRequired/RCTRequired.podspec b/Libraries/RCTRequired/RCTRequired.podspec index e4d10d5d15960c..af78958c1eb431 100644 --- a/Libraries/RCTRequired/RCTRequired.podspec +++ b/Libraries/RCTRequired/RCTRequired.podspec @@ -23,7 +23,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "RCTRequired" diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index 52f436c923e216..8eec71c5b41ae0 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/settings" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec index de7d3a3b6993d8..09bf353e368212 100644 --- a/Libraries/Text/React-RCTText.podspec +++ b/Libraries/Text/React-RCTText.podspec @@ -24,7 +24,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/text" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "**/*.{h,m}" s.ios.exclude_files = "**/macOS/*" # TODO(macOS GH#774) diff --git a/Libraries/TypeSafety/RCTTypeSafety.podspec b/Libraries/TypeSafety/RCTTypeSafety.podspec index af8dab2bbd21f4..4cb5dcb36d5627 100644 --- a/Libraries/TypeSafety/RCTTypeSafety.podspec +++ b/Libraries/TypeSafety/RCTTypeSafety.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.compiler_flags = folly_compiler_flags s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index aa7a2d60a9797a..b4587b69636ad2 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://reactnative.dev/docs/vibration" s.license = package["license"] s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" diff --git a/README.md b/README.md index 26aed19de38740..75f4ec5a9cd67e 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ You can read more about the macOS implementation on our website - [React Native ## Requirements -You can run React Native for macOS apps on Mac devices with versions Mojave (10.14) or newer. +You can run React Native for macOS apps on Mac devices with versions Catalina (10.15) or newer. For a full and detailed list of the system requirements and how to set up your development platform, see our [System Requirements](https://microsoft.github.io/react-native-windows/docs/rnm-dependencies) documentation on our website. diff --git a/React-Core.podspec b/React-Core.podspec index e12f7d87a403bd..2a49cfdb6293d7 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -41,7 +41,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.source = source s.resource_bundle = { "AccessibilityResources" => ["React/AccessibilityResources/*.lproj"]} s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags @@ -77,7 +77,7 @@ Pod::Spec.new do |s| end s.subspec "Hermes" do |ss| - ss.platforms = { :osx => "10.14", :ios => "10.0" } + ss.platforms = { :osx => "10.15", :ios => "10.0" } ss.source_files = "ReactCommon/hermes/executor/*.{cpp,h}", "ReactCommon/hermes/inspector/*.{cpp,h}", "ReactCommon/hermes/inspector/chrome/*.{cpp,h}", diff --git a/React.podspec b/React.podspec index 05a332c9b1e2ea..5e98a77e281a93 100644 --- a/React.podspec +++ b/React.podspec @@ -36,7 +36,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "5" } # TODO(macOS GH#214) s.source = source s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.cocoapods_version = ">= 1.2.0" diff --git a/React/Base/macOS/RCTDynamicColor.m b/React/Base/macOS/RCTDynamicColor.m index 3315979c300701..fbc93d1e07af2c 100644 --- a/React/Base/macOS/RCTDynamicColor.m +++ b/React/Base/macOS/RCTDynamicColor.m @@ -59,14 +59,12 @@ - (void)encodeWithCoder:(NSCoder *)aCoder - (NSColor *)effectiveColor { NSColor *effectiveColor = _aquaColor; - if (@available(macOS 10.14, *)) { - NSAppearance *appearance = [NSAppearance currentAppearance] ?: [NSApp effectiveAppearance]; + NSAppearance *appearance = [NSAppearance currentAppearance] ?: [NSApp effectiveAppearance]; - NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; + NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; - if (_darkAquaColor != nil && [appearanceName isEqualToString:NSAppearanceNameDarkAqua]) { - effectiveColor = _darkAquaColor; - } + if (_darkAquaColor != nil && [appearanceName isEqualToString:NSAppearanceNameDarkAqua]) { + effectiveColor = _darkAquaColor; } return effectiveColor; } diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm index b0da18b72db345..26133e1b6a60f9 100644 --- a/React/CoreModules/RCTAppearance.mm +++ b/React/CoreModules/RCTAppearance.mm @@ -66,29 +66,24 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride) #else // [TODO(macOS GH#774) NSString *RCTColorSchemePreference(NSAppearance *appearance) { - if (@available(macOS 10.14, *)) { - static NSDictionary *appearances; - static dispatch_once_t onceToken; - - dispatch_once(&onceToken, ^{ - appearances = @{ - NSAppearanceNameAqua: RCTAppearanceColorSchemeLight, - NSAppearanceNameDarkAqua: RCTAppearanceColorSchemeDark - }; - }); - - if (!sAppearancePreferenceEnabled) { - // Return the default if the app doesn't allow different color schemes. - return RCTAppearanceColorSchemeLight; - } - - appearance = appearance ?: [NSAppearance currentAppearance]; - NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; - return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight; + static NSDictionary *appearances; + static dispatch_once_t onceToken; + + dispatch_once(&onceToken, ^{ + appearances = @{ + NSAppearanceNameAqua: RCTAppearanceColorSchemeLight, + NSAppearanceNameDarkAqua: RCTAppearanceColorSchemeDark + }; + }); + + if (!sAppearancePreferenceEnabled) { + // Return the default if the app doesn't allow different color schemes. + return RCTAppearanceColorSchemeLight; } - // Default to light on older OS version - same behavior as Android. - return RCTAppearanceColorSchemeLight; + appearance = appearance ?: [NSAppearance currentAppearance]; + NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; + return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight; } #endif // ]TODO(macOS GH#774) @@ -165,7 +160,7 @@ - (void)appearanceChanged:(NSNotification *)notification - (void)startObserving { - if (@available(macOS 10.14, iOS 13.0, *)) { // TODO(macOS GH#774) + if (@available(iOS 13.0, *)) { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appearanceChanged:) name:RCTUserInterfaceStyleDidChangeNotification @@ -175,7 +170,7 @@ - (void)startObserving - (void)stopObserving { - if (@available(macOS 10.14, iOS 13.0, *)) { // TODO(macOS GH#774) + if (@available(iOS 13.0, *)) { [[NSNotificationCenter defaultCenter] removeObserver:self]; } } diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index 3e99a3ddc5cc3f..a2a54eeb3d58ab 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "**/*.{c,m,mm,cpp}" diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index 771a9084579ab9..deca133a14c049 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.header_dir = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags diff --git a/ReactCommon/callinvoker/React-callinvoker.podspec b/ReactCommon/callinvoker/React-callinvoker.podspec index 40f6d88f771959..75dc995a2b299a 100644 --- a/ReactCommon/callinvoker/React-callinvoker.podspec +++ b/ReactCommon/callinvoker/React-callinvoker.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "**/*.{cpp,h}" s.header_dir = "ReactCommon" diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index 94039dd0b7909f..37ea34b1ce57c3 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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "*.{cpp,h}" s.exclude_files = "SampleCxxModule.*" diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec index 2c6223894c6e0e..42788b6afae85f 100644 --- a/ReactCommon/jsi/React-jsi.podspec +++ b/ReactCommon/jsi/React-jsi.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "**/*.{cpp,h}" s.exclude_files = "**/test/*" diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index ee90076ee3cc5e..5197f19cd68797 100644 --- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/ReactCommon/jsiexecutor/React-jsiexecutor.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "jsireact/*.{cpp,h}" s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags diff --git a/ReactCommon/jsinspector/React-jsinspector.podspec b/ReactCommon/jsinspector/React-jsinspector.podspec index e18cfd434e7494..7c0e87cdc9fc53 100644 --- a/ReactCommon/jsinspector/React-jsinspector.podspec +++ b/ReactCommon/jsinspector/React-jsinspector.podspec @@ -23,7 +23,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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "*.{cpp,h}" s.header_dir = 'jsinspector' diff --git a/ReactCommon/reactperflogger/React-perflogger.podspec b/ReactCommon/reactperflogger/React-perflogger.podspec index a2f47038c42908..a3d4dd68ff684f 100644 --- a/ReactCommon/reactperflogger/React-perflogger.podspec +++ b/ReactCommon/reactperflogger/React-perflogger.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#774) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#774) s.source = source s.source_files = "**/*.{cpp,h}" s.header_dir = "reactperflogger" diff --git a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec index 83a68c472a5ee7..b7e557fab3be04 100644 --- a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec +++ b/ReactCommon/runtimeexecutor/React-runtimeexecutor.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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.source = source s.source_files = "**/*.{cpp,h}" s.header_dir = "ReactCommon" diff --git a/ReactCommon/yoga/Yoga.podspec b/ReactCommon/yoga/Yoga.podspec index 34f4ea25696505..f457c918ba5ee7 100644 --- a/ReactCommon/yoga/Yoga.podspec +++ b/ReactCommon/yoga/Yoga.podspec @@ -43,7 +43,7 @@ Pod::Spec.new do |spec| ] # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "10.0", :osx => "10.14" } + spec.platforms = { :ios => "10.0", :osx => "10.15" } # Set this environment variable when *not* using the `:path` option to install the pod. # E.g. when publishing this spec to a spec repo. diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec index 8fecb219b26c29..176e7b0221ff39 100644 --- a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec +++ b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/microsoft/react-native-windows" s.license = package["license"] s.author = "Microsoft Corporation" - s.platforms = { :ios => "10.0", :osx => "10.14" } + s.platforms = { :ios => "10.0", :osx => "10.15" } s.compiler_flags = folly_compiler_flags s.source = { :git => 'https://github.com/microsoft/react-native-windows.git', :commit => "d9077991441889ddaa18a8af6a2cc8514ca7714d" } diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec index 0412b925cda1e9..acd18be0d3e253 100644 --- a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec +++ b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/microsoft/react-native-macos" s.license = package["license"] s.author = "Microsoft Corporation" - s.platforms = { :ios => "10.0", :osx => "10.14" } + s.platforms = { :ios => "10.0", :osx => "10.15" } s.compiler_flags = folly_compiler_flags s.source = source diff --git a/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj b/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj index 933b32730bceb2..a55f1c2a6bf1d9 100644 --- a/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj +++ b/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj @@ -465,7 +465,7 @@ DEAD_CODE_STRIPPING = NO; INFOPLIST_FILE = "HelloWorld-macos/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -485,7 +485,7 @@ CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = "HelloWorld-macos/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/local-cli/generator-macos/templates/macos/Podfile b/local-cli/generator-macos/templates/macos/Podfile index b0c122413b3fe3..695fbffda9b8fb 100644 --- a/local-cli/generator-macos/templates/macos/Podfile +++ b/local-cli/generator-macos/templates/macos/Podfile @@ -2,7 +2,7 @@ require_relative '../node_modules/react-native-macos/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' target 'HelloWorld-macOS' do - platform :macos, '10.14' + platform :macos, '10.15' use_native_modules! use_react_native!( :path => '../node_modules/react-native-macos', diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile index 56fedf74cba92f..61546586a77e62 100644 --- a/packages/rn-tester/Podfile +++ b/packages/rn-tester/Podfile @@ -52,18 +52,18 @@ target 'RNTesterIntegrationTests' do end target 'RNTester-macOS' do - platform :osx, '10.14' + platform :osx, '10.15' pods(:hermes_enabled => false) end target 'RNTester-macOSUnitTests' do - platform :osx, '10.14' + platform :osx, '10.15' pods() pod 'React-RCTTest', :path => "./RCTTest" end target 'RNTester-macOSIntegrationTests' do - platform :osx, '10.14' + platform :osx, '10.15' pods() pod 'React-RCTTest', :path => "./RCTTest" end @@ -80,7 +80,7 @@ target 'iosSimulatorBuild' do end target 'macOSBuild' do - platform :osx, '10.14' + platform :osx, '10.15' pods() end # ]TODO(macOS GH#774) diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec index f2c3f7b7af21e5..146cca6a974ab6 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 => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + s.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source s.source_files = "**/*.{h,m,mm}" diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 448426a71f3421..f125168771596c 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -1712,7 +1712,7 @@ CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; EXECUTABLE_PREFIX = lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( @@ -1738,7 +1738,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -1936,7 +1936,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( @@ -1977,7 +1977,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -2012,7 +2012,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( @@ -2049,7 +2049,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -2085,7 +2085,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( @@ -2119,7 +2119,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", diff --git a/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSColorTests.m b/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSColorTests.m index 64a1b20ebe08a4..9d38caf000dec3 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSColorTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSColorTests.m @@ -55,18 +55,14 @@ - (void)testAlternatingColorEven { id json = RCTJSONParse(@"{ \"semantic\": \"alternatingContentBackgroundColorEven\" }", nil); NSColor *value = [RCTConvert UIColor:json]; - if (@available(macOS 10.14, *)) { - XCTAssertEqualObjects(value, [NSColor alternatingContentBackgroundColors][0]); - } + XCTAssertEqualObjects(value, [NSColor alternatingContentBackgroundColors][0]); } - (void)testAlternatingColorOdd { id json = RCTJSONParse(@"{ \"semantic\": \"alternatingContentBackgroundColorOdd\" }", nil); NSColor *value = [RCTConvert UIColor:json]; - if (@available(macOS 10.14, *)) { - XCTAssertEqualObjects(value, [NSColor alternatingContentBackgroundColors][1]); - } + XCTAssertEqualObjects(value, [NSColor alternatingContentBackgroundColors][1]); } - (void)testAlternatingColorFallbackEven @@ -99,14 +95,12 @@ - (void)testDynamicColor XCTAssertEqual(b, 0); XCTAssertEqual(a, 0); - if (@available(macOS 10.14, *)) { - [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; - [value getRed:&r green:&g blue:&b alpha:&a]; - XCTAssertEqual(r, 1); - XCTAssertEqual(g, 1); - XCTAssertEqual(b, 1); - XCTAssertEqual(a, 0); - } + [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; + [value getRed:&r green:&g blue:&b alpha:&a]; + XCTAssertEqual(r, 1); + XCTAssertEqual(g, 1); + XCTAssertEqual(b, 1); + XCTAssertEqual(a, 0); [NSAppearance setCurrentAppearance:nil]; } @@ -127,15 +121,13 @@ - (void)testCompositeDynamicColor XCTAssertEqual(b1, b2); XCTAssertEqual(a1, a2); - if (@available(macOS 10.14, *)) { - [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; - [[value colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r1 green:&g1 blue:&b1 alpha:&a1]; - [[[NSColor systemBlueColor] colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r2 green:&g2 blue:&b2 alpha:&a2]; - XCTAssertEqual(r1, r2); - XCTAssertEqual(g1, g2); - XCTAssertEqual(b1, b2); - XCTAssertEqual(a1, a2); - } + [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; + [[value colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r1 green:&g1 blue:&b1 alpha:&a1]; + [[[NSColor systemBlueColor] colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r2 green:&g2 blue:&b2 alpha:&a2]; + XCTAssertEqual(r1, r2); + XCTAssertEqual(g1, g2); + XCTAssertEqual(b1, b2); + XCTAssertEqual(a1, a2); [NSAppearance setCurrentAppearance:nil]; } diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec index f0fcefc371c585..502406fa2e3b14 100644 --- a/third-party-podspecs/DoubleConversion.podspec +++ b/third-party-podspecs/DoubleConversion.podspec @@ -19,6 +19,6 @@ Pod::Spec.new do |spec| spec.compiler_flags = '-Wno-unreachable-code' # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + spec.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) end diff --git a/third-party-podspecs/RCT-Folly.podspec b/third-party-podspecs/RCT-Folly.podspec index 206c4a63694651..7cb21aec4e2c60 100644 --- a/third-party-podspecs/RCT-Folly.podspec +++ b/third-party-podspecs/RCT-Folly.podspec @@ -125,5 +125,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", :osx => "10.14", :tvos => "9.0", } # TODO(macOS GH#214) + spec.platforms = { :ios => "9.0", :osx => "10.15", :tvos => "9.0", } # TODO(macOS GH#214) end diff --git a/third-party-podspecs/boost-for-react-native.podspec b/third-party-podspecs/boost-for-react-native.podspec index 592192a6d889fc..27caa8bc4139ac 100644 --- a/third-party-podspecs/boost-for-react-native.podspec +++ b/third-party-podspecs/boost-for-react-native.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| # Pinning to the same version as React.podspec. # TODO: Move this osx addition back upstream to https://github.com/react-native-community/boost-for-react-native - spec.platforms = { :ios => '8.0', :osx => "10.14" } + spec.platforms = { :ios => '8.0', :osx => "10.15" } spec.requires_arc = false spec.module_name = 'boost' diff --git a/third-party-podspecs/glog.podspec b/third-party-podspecs/glog.podspec index ef6cc0e262a237..0a6edc54f16230 100644 --- a/third-party-podspecs/glog.podspec +++ b/third-party-podspecs/glog.podspec @@ -34,6 +34,6 @@ Pod::Spec.new do |spec| "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src" } # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214) + spec.platforms = { :ios => "10.0", :osx => "10.15" } # TODO(macOS GH#214) end diff --git a/third-party-podspecs/libevent.podspec b/third-party-podspecs/libevent.podspec index ee693a75739695..3c7b91fb214bd6 100644 --- a/third-party-podspecs/libevent.podspec +++ b/third-party-podspecs/libevent.podspec @@ -549,7 +549,7 @@ Pod::Spec.new do |spec| spec.homepage = "https://libevent.org" spec.license = { :type => "BSD 3-Clause", :file => "LICENSE" } spec.author = "Niels Provos and Nick Mathewson" - spec.platforms = { :osx => "10.14", :ios => "10.0" } + spec.platforms = { :osx => "10.15", :ios => "10.0" } spec.source = { :git => "https://github.com/libevent/libevent.git", :tag => "release-#{spec.version}-stable" } spec.prepare_command = "touch evconfig-private.h; echo -e #{Shellwords.escape(CONFIG_WITHOUT_OPENSSL)} > include/event2/event-config.h" spec.source_files =