From 8d02e1723fd972d55eceb7de7c25dacf691d83df 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 [iOS] [Changed] - Renamed yoga podspec to Yoga Reviewed By: shergin Differential Revision: D17127104 fbshipit-source-id: 14047bf452edda000037701f4ba7f4a02a0e717b --- RNTester/Podfile.lock | 123 ++++++++++++++++------------------ React-Core.podspec | 2 +- ReactCommon/yoga/yoga.podspec | 2 +- scripts/autolink-ios.rb | 2 +- template/ios/Podfile | 2 +- 5 files changed, 62 insertions(+), 69 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index d4d40b4bda03d7..a8536be1a4e704 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -27,7 +27,8 @@ PODS: - React-Core (= 1000.0.0) - React (1000.0.0): - React-Core (= 1000.0.0) - - React-DevSupport (= 1000.0.0) + - React-Core/DevSupport (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-RCTActionSheet (= 1000.0.0) - React-RCTAnimation (= 1000.0.0) - React-RCTBlob (= 1000.0.0) @@ -37,7 +38,6 @@ PODS: - React-RCTSettings (= 1000.0.0) - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - - React-RCTWebSocket (= 1000.0.0) - React-ART (1000.0.0): - React-Core/ARTHeaders (= 1000.0.0) - React-Core (1000.0.0): @@ -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,22 +63,24 @@ 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) - - React-Core/DevSupportHeaders (1000.0.0): + - Yoga + - React-Core/DevSupport (1000.0.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default + - React-Core/Default (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) + - React-jsinspector (= 1000.0.0) + - Yoga - React-Core/RCTActionSheetHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -86,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 @@ -94,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 @@ -102,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 @@ -110,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 @@ -118,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 @@ -126,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 @@ -134,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 @@ -142,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 @@ -150,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 @@ -158,29 +160,28 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - yoga (= 1000.0.0.React) - - React-Core/RCTWebSocketHeaders (1000.0.0): + - Yoga + - React-Core/RCTWebSocket (1000.0.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default + - React-Core/Default (= 1000.0.0) - 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) + - RCTTypeSafety (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) + - React-RCTImage (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - React-cxxreact (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - React-jsinspector (= 1000.0.0) - - React-DevSupport (1000.0.0): - - React-Core/DevSupportHeaders (= 1000.0.0) - - React-jsinspector (= 1000.0.0) - - React-RCTWebSocket (= 1000.0.0) - React-jsi (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion @@ -205,9 +206,9 @@ PODS: - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-RCTBlob (1000.0.0): - React-Core/RCTBlobHeaders (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - - React-RCTWebSocket (= 1000.0.0) - React-RCTImage (1000.0.0): - React-Core/RCTImageHeaders (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) @@ -225,8 +226,6 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - React-Core/RCTVibrationHeaders (= 1000.0.0) - - React-RCTWebSocket (1000.0.0): - - React-Core/RCTWebSocketHeaders (= 1000.0.0) - ReactCommon/jscallinvoker (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) @@ -249,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`) @@ -262,9 +261,10 @@ DEPENDENCIES: - React (from `../`) - React-ART (from `../Libraries/ART`) - React-Core (from `../`) + - React-Core/DevSupport (from `../`) + - React-Core/RCTWebSocket (from `../`) - React-CoreModules (from `../React/CoreModules`) - React-cxxreact (from `../ReactCommon/cxxreact`) - - React-DevSupport (from `../React`) - React-jsi (from `../ReactCommon/jsi`) - React-jsiexecutor (from `../ReactCommon/jsiexecutor`) - React-jsinspector (from `../ReactCommon/jsinspector`) @@ -279,11 +279,10 @@ DEPENDENCIES: - React-RCTTest (from `RCTTest`) - React-RCTText (from `../Libraries/Text`) - React-RCTVibration (from `../Libraries/Vibration`) - - React-RCTWebSocket (from `../Libraries/WebSocket`) - 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: @@ -314,8 +313,6 @@ EXTERNAL SOURCES: :path: "../React/CoreModules" React-cxxreact: :path: "../ReactCommon/cxxreact" - React-DevSupport: - :path: "../React" React-jsi: :path: "../ReactCommon/jsi" React-jsiexecutor: @@ -344,46 +341,42 @@ EXTERNAL SOURCES: :path: "../Libraries/Text" React-RCTVibration: :path: "../Libraries/Vibration" - React-RCTWebSocket: - :path: "../Libraries/WebSocket" ReactCommon: :path: "../ReactCommon" - yoga: + Yoga: :path: "../ReactCommon/yoga" SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0 - FBReactNativeSpec: 0c434153f44d4a1cbd111fbde1502580475e9132 + FBReactNativeSpec: e9febd2d5cc091662f172724165922b2e28d10a3 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: 770d733d8b6881e0ecd1085d0eb7f57dfacc5d93 - RCTTypeSafety: 8540a73bafd032be534cb683471f985dc656bfb6 - React: 7c652b87c228731c51ab5764de68b6c17e6342be - React-ART: 84555d2fcff922e3fed8ce70b5fb2536fb7c163e - React-Core: 266e5912bbfd0bddb866782b9bb560d82c5b8ef4 - React-CoreModules: 018c3d55a5bfbd04655489942a8c606527176eed - React-cxxreact: 8cbb09bfdf4241546c5f4a9f46d92f63295281e0 - React-DevSupport: f5349e286c067443895e6ae60d808eeaabedf472 - React-jsi: ec7bccfadb03c9aa26db7ba880a02b983b921316 - React-jsiexecutor: 173df46fcbafe60986cd5e42bde45e693c783af9 - React-jsinspector: 426757e28a6909b49f7dd126f6f1dbd2783764f8 - React-RCTActionSheet: a172ba63176ca80d7440f29fdd65515b442e4232 - React-RCTAnimation: 276dde8150bb1a7d9eef8f3b44db66bddebedec3 - React-RCTBlob: d60bf36ef77d3fb9e39a46443ea89c68381b4650 - React-RCTImage: 29cbf7ccc2b89ac7ac6d9f2c84c15cfabaeabe6b - React-RCTLinking: 387d21f8fd4423dde220bf18be9715054cfc7cf5 - React-RCTNetwork: ad750ce9bd98d382020174b14537d2ffa09427e0 - React-RCTPushNotification: 90e1127e8f243296eef48c35dba370588405728b - React-RCTSettings: 405b277fb5afed794564af2d99ab71315806768d - React-RCTTest: c999df66263f36ddd63328356ac5898f2089e91e - React-RCTText: 667603cc6464856a6314a05b3d605da0a7fbf8e3 - React-RCTVibration: 775cffcf1040bfa92fea6982f43d5f1a438edf05 - React-RCTWebSocket: c10d7eecfc66d58ece635508dc1e8ecf6b548c60 - ReactCommon: 7fd06e02cb448d0260cb7219cf0057984b49de17 - yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07 + RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8 + RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e + React: 28a654b69575941571c073a656bc06795825e7f7 + React-ART: a5da06a892342d03896e0db45a7072525981f63c + React-Core: f8656b21cfe16b1fe276686f3b921bce0fa6de4d + React-CoreModules: 96b2f1e0b84493e6c1b7f3bb21357f24fdcfce2f + React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c + React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f + React-jsiexecutor: c0ab8c80a6e88380d63f583690a50d4a723b47b5 + React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0 + React-RCTActionSheet: 090e7bd7c5774d919c47c4eeff78223a7fd8c19c + React-RCTAnimation: 73d536fff417a101724d9529189c95a94263710c + React-RCTBlob: 86017e0ba937b94445c5f680fef27ab831700fe7 + React-RCTImage: 7f5c9bff34905f1bc216be512ba0ae68f872208a + React-RCTLinking: d7d7f792e63a8d57380cecbb9b7a3b31f92d1bb6 + React-RCTNetwork: c8f9d40297f35ea3792ea81866f33e8b45c25935 + React-RCTPushNotification: acffa8af6a20e6d41b041a8c4cb4bea0de9df0dd + React-RCTSettings: dd4009546ce88c3647c32f0b5922459ab313fdca + React-RCTTest: 73df09ec226fcad6e7e058a313e5dd16cccf86a8 + React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17 + React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90 + ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b + Yoga: d2044f32d047e7f5a36b6894347569f069c0f9b7 PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87 -COCOAPODS: 1.7.1 +COCOAPODS: 1.7.2 diff --git a/React-Core.podspec b/React-Core.podspec index 04e49efb978618..388c48ef59c049 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -86,6 +86,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 a1e6b9cf345ad5..a27aad0d7c8ce5 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 054003a115aae0..5d3e01756ff61b 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 3fb683e1f32bae..bf34c97b5beae3 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'