From 82a8080f0704e83079d0429e4e367f5131052e64 Mon Sep 17 00:00:00 2001 From: Ram N Date: Fri, 30 Aug 2019 07:10:51 -0700 Subject: [PATCH] Change podspec name of yoga to Yoga Summary: Needed to capitalize the name, since this is the convention used elsewhere too ## Changelog: [iOS] [Changed] - Renamed yoga podspec to Yoga Reviewed By: shergin Differential Revision: D17127104 fbshipit-source-id: 14047bf452edda000037701f4ba7f4a02a0e717b --- RNTester/Podfile.lock | 44 +++++++++++++++++------------------ React-Core.podspec | 2 +- ReactCommon/yoga/yoga.podspec | 2 +- scripts/autolink-ios.rb | 2 +- template/ios/Podfile | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 7357c2f0d61..a8536be1a4e 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -47,7 +47,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/ARTHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -55,7 +55,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/CoreModulesHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -63,14 +63,14 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/Default (1000.0.0): - Folly (= 2018.10.22.00) - glog - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/DevSupport (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -80,7 +80,7 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - React-jsinspector (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTActionSheetHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -88,7 +88,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTAnimationHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -96,7 +96,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTBlobHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -104,7 +104,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTImageHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -112,7 +112,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTLinkingHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -120,7 +120,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTNetworkHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -128,7 +128,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTPushNotificationHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -136,7 +136,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTSettingsHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -144,7 +144,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTTextHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -152,7 +152,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTVibrationHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -160,7 +160,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-Core/RCTWebSocket (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -168,7 +168,7 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - Yoga - React-CoreModules (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - Folly (= 2018.10.22.00) @@ -248,7 +248,7 @@ PODS: - React-jsi (= 1000.0.0) - ReactCommon/jscallinvoker (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - yoga (1000.0.0.React) + - Yoga (1000.0.0.React) DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) @@ -282,7 +282,7 @@ DEPENDENCIES: - ReactCommon/jscallinvoker (from `../ReactCommon`) - ReactCommon/turbomodule/core (from `../ReactCommon`) - ReactCommon/turbomodule/samples (from `../ReactCommon`) - - yoga (from `../ReactCommon/yoga`) + - Yoga (from `../ReactCommon/yoga`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -343,7 +343,7 @@ EXTERNAL SOURCES: :path: "../Libraries/Vibration" ReactCommon: :path: "../ReactCommon" - yoga: + Yoga: :path: "../ReactCommon/yoga" SPEC CHECKSUMS: @@ -357,7 +357,7 @@ SPEC CHECKSUMS: RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e React: 28a654b69575941571c073a656bc06795825e7f7 React-ART: a5da06a892342d03896e0db45a7072525981f63c - React-Core: 47b8ab211d9325292811e62ee23c54b464853111 + React-Core: f8656b21cfe16b1fe276686f3b921bce0fa6de4d React-CoreModules: 96b2f1e0b84493e6c1b7f3bb21357f24fdcfce2f React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f @@ -375,8 +375,8 @@ SPEC CHECKSUMS: React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17 React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90 ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b - yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07 + Yoga: d2044f32d047e7f5a36b6894347569f069c0f9b7 PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87 -COCOAPODS: 1.7.1 +COCOAPODS: 1.7.2 diff --git a/React-Core.podspec b/React-Core.podspec index 77f430a032f..f57f6d98e7f 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -96,6 +96,6 @@ Pod::Spec.new do |s| s.dependency "React-cxxreact", version s.dependency "React-jsi", version s.dependency "React-jsiexecutor", version - s.dependency "yoga", "#{version}.React" + s.dependency "Yoga" s.dependency "glog" end diff --git a/ReactCommon/yoga/yoga.podspec b/ReactCommon/yoga/yoga.podspec index a1e6b9cf345..a27aad0d7c8 100644 --- a/ReactCommon/yoga/yoga.podspec +++ b/ReactCommon/yoga/yoga.podspec @@ -15,7 +15,7 @@ else end Pod::Spec.new do |spec| - spec.name = 'yoga' + spec.name = 'Yoga' spec.version = "#{version}.React" spec.license = { :type => 'MIT' } spec.homepage = 'https://yogalayout.com' diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index 2a57c3747db..b776bc78967 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -38,7 +38,7 @@ def use_react_native! (options={}) pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector" pod 'ReactCommon/jscallinvoker', :path => "#{prefix}/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon" - pod 'yoga', :path => "#{prefix}/ReactCommon/yoga" + pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga" pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec" pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec" diff --git a/template/ios/Podfile b/template/ios/Podfile index fe6d533bc5f..7706b8362a6 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -28,7 +28,7 @@ target 'HelloWorld' do pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' + pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga' pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'