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

Gutenberg: Update gutenberg to use RN version 0.59.0 #11271

Merged
merged 6 commits into from
Mar 15, 2019
Merged

Gutenberg: Update gutenberg to use RN version 0.59.0 #11271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbed6c4
Update gutenberg and gutenberg dependencies to test rn version 0.59.0
etoledom Mar 14, 2019
ebf9f91
Merge branch 'develop' into gutenberg/update-rn-to-0.59.0
etoledom Mar 14, 2019
8a1b0eb
Update gutenberg ref to test RN update to 0.59.0
etoledom Mar 14, 2019
1d0bdd1
Update gutenberg hash
etoledom Mar 15, 2019
92dca68
Merge branch 'develop' into gutenberg/update-rn-to-0.59.0
etoledom Mar 15, 2019
a237653
Update gutenberg commit to latest from develop
etoledom Mar 15, 2019
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
32 changes: 20 additions & 12 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,26 @@ def shared_test_pods
pod 'OCMock', '~> 3.4'
end

def gutenberg_pod(name, branch=nil)
gutenberg_branch=branch || 'master'
pod name, :podspec => "https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/#{gutenberg_branch}/react-native-gutenberg-bridge/third-party-podspecs/#{name}.podspec.json"
end

def gutenberg(options)
options[:git] = 'http://github.com/wordpress-mobile/gutenberg-mobile/'
pod 'Gutenberg', options
pod 'RNTAztecView', options

gutenberg_dependencies options
end

def gutenberg_dependencies(options)
dependencies = [
'React',
'yoga',
'Folly',
'react-native-safe-area',
]
tag_or_commit = options[:tag] || options[:commit]

for pod_name in dependencies do
pod pod_name, :podspec => "https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/#{tag_or_commit}/react-native-gutenberg-bridge/third-party-podspecs/#{pod_name}.podspec.json"
end
end

## WordPress iOS
Expand All @@ -86,16 +98,12 @@ target 'WordPress' do
shared_with_all_pods
shared_with_networking_pods

## React Native
## Gutenberg (React Native)
## =====================
##
gutenberg :git => 'http://github.com/wordpress-mobile/gutenberg-mobile/', :commit => 'a2342d479eccfd84a14e49f9c88d1b64899db921'
gutenberg :commit => '633add26135c66953c70d7e74701430e33b1dddf'

gutenberg_pod 'React'
gutenberg_pod 'yoga'
gutenberg_pod 'Folly'
gutenberg_pod 'react-native-safe-area'
pod 'RNSVG', :git => 'https://github.com/wordpress-mobile/react-native-svg.git', :tag => '8.0.9-gb.0'
pod 'RNSVG', :git => 'https://github.com/wordpress-mobile/react-native-svg.git', :tag => '9.3.3-gb'
pod 'react-native-keyboard-aware-scroll-view', :git => 'https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git', :tag => 'gb-v0.8.6'

## Third party libraries
Expand Down
128 changes: 68 additions & 60 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PODS:
- Fabric (~> 1.9.0)
- DoubleConversion (1.1.5)
- Fabric (1.9.0)
- Folly (2016.10.31.00):
- Folly (2018.10.22.00):
- boost-for-react-native
- DoubleConversion
- glog
Expand All @@ -57,18 +57,18 @@ PODS:
- "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
- Gridicons (0.18)
- Gutenberg (1.1.0):
- React/Core (= 0.57.5)
- React/CxxBridge (= 0.57.5)
- React/DevSupport (= 0.57.5)
- React/RCTActionSheet (= 0.57.5)
- React/RCTAnimation (= 0.57.5)
- React/RCTImage (= 0.57.5)
- React/RCTLinkingIOS (= 0.57.5)
- React/RCTNetwork (= 0.57.5)
- React/RCTText (= 0.57.5)
- React/Core (= 0.59.0)
- React/CxxBridge (= 0.59.0)
- React/DevSupport (= 0.59.0)
- React/RCTActionSheet (= 0.59.0)
- React/RCTAnimation (= 0.59.0)
- React/RCTImage (= 0.59.0)
- React/RCTLinkingIOS (= 0.59.0)
- React/RCTNetwork (= 0.59.0)
- React/RCTText (= 0.59.0)
- RNTAztecView
- WordPress-Aztec-iOS
- yoga (= 0.57.5.React)
- yoga (= 0.59.0.React)
- HockeySDK (5.1.4):
- HockeySDK/DefaultLib (= 5.1.4)
- HockeySDK/DefaultLib (5.1.4)
Expand Down Expand Up @@ -122,52 +122,60 @@ PODS:
- OHHTTPStubs/Swift (6.1.0):
- OHHTTPStubs/Default
- Reachability (3.2)
- React (0.57.5):
- React/Core (= 0.57.5)
- React (0.59.0):
- React/Core (= 0.59.0)
- react-native-keyboard-aware-scroll-view (0.8.6):
- React
- react-native-safe-area (0.5.0):
- React
- React/Core (0.57.5):
- yoga (= 0.57.5.React)
- React/CxxBridge (0.57.5):
- Folly (= 2016.10.31.00)
- React/Core (0.59.0):
- yoga (= 0.59.0.React)
- React/CxxBridge (0.59.0):
- Folly (= 2018.10.22.00)
- React/Core
- React/cxxreact
- React/cxxreact (0.57.5):
- React/jsiexecutor
- React/cxxreact (0.59.0):
- boost-for-react-native (= 1.63.0)
- Folly (= 2016.10.31.00)
- React/jschelpers
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsinspector
- React/DevSupport (0.57.5):
- React/DevSupport (0.59.0):
- React/Core
- React/RCTWebSocket
- React/fishhook (0.57.5)
- React/jschelpers (0.57.5):
- Folly (= 2016.10.31.00)
- React/PrivateDatabase
- React/jsinspector (0.57.5)
- React/PrivateDatabase (0.57.5)
- React/RCTActionSheet (0.57.5):
- React/fishhook (0.59.0)
- React/jsi (0.59.0):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsiexecutor (0.59.0):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/cxxreact
- React/jsi
- React/jsinspector (0.59.0)
- React/RCTActionSheet (0.59.0):
- React/Core
- React/RCTAnimation (0.57.5):
- React/RCTAnimation (0.59.0):
- React/Core
- React/RCTBlob (0.57.5):
- React/RCTBlob (0.59.0):
- React/Core
- React/RCTImage (0.57.5):
- React/RCTImage (0.59.0):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.57.5):
- React/RCTLinkingIOS (0.59.0):
- React/Core
- React/RCTNetwork (0.57.5):
- React/RCTNetwork (0.59.0):
- React/Core
- React/RCTText (0.57.5):
- React/RCTText (0.59.0):
- React/Core
- React/RCTWebSocket (0.57.5):
- React/RCTWebSocket (0.59.0):
- React/Core
- React/fishhook
- React/RCTBlob
- RNSVG (8.0.9):
- RNSVG (9.3.3):
- React
- RNTAztecView (1.1.0):
- React
Expand Down Expand Up @@ -204,7 +212,7 @@ PODS:
- WordPressUI (1.2.0)
- WPMediaPicker (1.3.2)
- wpxmlrpc (0.8.4)
- yoga (0.57.5.React)
- yoga (0.59.0.React)
- ZendeskSDK (2.2.0):
- ZendeskSDK/Providers (= 2.2.0)
- ZendeskSDK/UI (= 2.2.0)
Expand All @@ -223,12 +231,12 @@ DEPENDENCIES:
- Charts (~> 3.2.2)
- CocoaLumberjack (= 3.4.2)
- Crashlytics (= 3.12.0)
- Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`)
- Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`)
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
- Gifu (= 3.2.0)
- GiphyCoreSDK (~> 1.4.0)
- Gridicons (~> 0.16)
- Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `a2342d479eccfd84a14e49f9c88d1b64899db921`)
- Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `633add26135c66953c70d7e74701430e33b1dddf`)
- HockeySDK (= 5.1.4)
- MGSwipeTableCell (= 1.6.8)
- MRProgress (= 0.8.3)
Expand All @@ -239,11 +247,11 @@ DEPENDENCIES:
- OHHTTPStubs (= 6.1.0)
- OHHTTPStubs/Swift (= 6.1.0)
- Reachability (= 3.2)
- React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`)
- React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`)
- react-native-keyboard-aware-scroll-view (from `https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git`, tag `gb-v0.8.6`)
- react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`)
- RNSVG (from `https://github.com/wordpress-mobile/react-native-svg.git`, tag `8.0.9-gb.0`)
- RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `a2342d479eccfd84a14e49f9c88d1b64899db921`)
- react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`)
- RNSVG (from `https://github.com/wordpress-mobile/react-native-svg.git`, tag `9.3.3-gb`)
- RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `633add26135c66953c70d7e74701430e33b1dddf`)
- SimulatorStatusMagic
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
Expand All @@ -253,7 +261,7 @@ DEPENDENCIES:
- WordPressShared (= 1.7.2)
- WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`)
- WPMediaPicker (= 1.3.2)
- yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`)
- yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`)
- ZendeskSDK (= 2.2.0)

SPEC REPOS:
Expand Down Expand Up @@ -302,44 +310,44 @@ EXTERNAL SOURCES:
:git: https://github.com/Automattic/Automattic-Tracks-iOS.git
:tag: 0.3.2
Folly:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json
Gutenberg:
:commit: a2342d479eccfd84a14e49f9c88d1b64899db921
:commit: 633add26135c66953c70d7e74701430e33b1dddf
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
React:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json
react-native-keyboard-aware-scroll-view:
:git: https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git
:tag: gb-v0.8.6
react-native-safe-area:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json
RNSVG:
:git: https://github.com/wordpress-mobile/react-native-svg.git
:tag: 8.0.9-gb.0
:tag: 9.3.3-gb
RNTAztecView:
:commit: a2342d479eccfd84a14e49f9c88d1b64899db921
:commit: 633add26135c66953c70d7e74701430e33b1dddf
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
WordPressUI:
:git: https://github.com/wordpress-mobile/WordPressUI-iOS.git
:tag: 1.2.0
yoga:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/633add26135c66953c70d7e74701430e33b1dddf/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json

CHECKOUT OPTIONS:
Automattic-Tracks-iOS:
:git: https://github.com/Automattic/Automattic-Tracks-iOS.git
:tag: 0.3.2
Gutenberg:
:commit: a2342d479eccfd84a14e49f9c88d1b64899db921
:commit: 633add26135c66953c70d7e74701430e33b1dddf
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
react-native-keyboard-aware-scroll-view:
:git: https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git
:tag: gb-v0.8.6
RNSVG:
:git: https://github.com/wordpress-mobile/react-native-svg.git
:tag: 8.0.9-gb.0
:tag: 9.3.3-gb
RNTAztecView:
:commit: a2342d479eccfd84a14e49f9c88d1b64899db921
:commit: 633add26135c66953c70d7e74701430e33b1dddf
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
WordPressUI:
:git: https://github.com/wordpress-mobile/WordPressUI-iOS.git
Expand All @@ -356,15 +364,15 @@ SPEC CHECKSUMS:
Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Fabric: f988e33c97f08930a413e08123064d2e5f68d655
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
Folly: de497beb10f102453a1afa9edbf8cf8a251890de
FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
GiphyCoreSDK: 147a492c2477e9ddb20f8dd3a4489e3ea3c05e38
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
GoogleSignInRepacked: d357702618c555f38923576924661325eb1ef22b
GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
Gridicons: 04261236382e9c62c62c9a104f2f532c1bdf6a78
Gutenberg: 9852b3b20fece652dcdd249df2207346934487c2
Gutenberg: a913b03aa475e9f8ffe3e73d9b0f7b4a1172ed94
HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
MGSwipeTableCell: dc4eca3212ed38a563b27d6aa7b3c01ce656c1e2
Expand All @@ -375,10 +383,10 @@ SPEC CHECKSUMS:
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
React: 01aa04500b2957c2767e1dff9fe12e09444a467c
React: 0d6c719d9549bea0bd5676f8170b0e5c56e2c3c7
react-native-keyboard-aware-scroll-view: 10f0da6653e67ed77ec55e409c9b21cd2aa3a5f8
react-native-safe-area: 7dc92953fce43bf36ab5ecae2fb4ffa2bda9a203
RNSVG: 6d5813dd9c6a8e041e142abf1372faf012ce5759
RNSVG: 978db19eaef499d9ebffb74a091ca0abf209c8c1
RNTAztecView: 9fb726a94d97f91e890a1db4f1ffe90be9fc9671
SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
Expand All @@ -392,9 +400,9 @@ SPEC CHECKSUMS:
WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
WPMediaPicker: e50edd8f30f5d87288840941ef3ff9cd11860937
wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c
yoga: 1fe535cf9b523600f42e2785b6ed56484a62b46d
ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878

PODFILE CHECKSUM: 65bfb786c687096b4476a4aa85d7e173badcc2b6
PODFILE CHECKSUM: 0e9eb9a0beb1385a30860e89951500bf6f82a528

COCOAPODS: 1.5.3