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/integrate release 1.31.0 #14374

Merged
merged 18 commits into from
Jun 26, 2020
Merged

Gutenberg/integrate release 1.31.0 #14374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
75a07fd
Update source of third party podspecs in monorepo
ceyhun May 26, 2020
0ad3657
Update gutenberg pod commit hash
ceyhun May 26, 2020
bebc910
Include submodules for gutenberg related deps
ceyhun May 26, 2020
e1564e7
Add react-native-get-random-values to gutenberg dependencies
ceyhun May 26, 2020
54a517c
Update gutenberg-mobile ref
ceyhun Jun 18, 2020
7c05788
Merge branch 'develop' into gutenberg/try-enabling-build-from-monorepo
ceyhun Jun 18, 2020
36da201
Update gutenberg-mobile ref
ceyhun Jun 18, 2020
e1f3941
Update gutenberg-mobile ref
ceyhun Jun 19, 2020
d0c102a
Update gutenberg-mobile ref
ceyhun Jun 19, 2020
ca40c71
Update Podfile's gutenberg ref to bring in monorepo changes
mchowning Jun 23, 2020
567a30a
Merge remote-tracking branch 'origin/gutenberg/integrate_release_1.31…
mchowning Jun 23, 2020
95f2f1a
Merge pull request #14188 from wordpress-mobile/gutenberg/try-enablin…
mchowning Jun 23, 2020
35b7b76
Update release notes.
SergioEstevao Jun 26, 2020
7a6e033
Merge branch 'develop' into gutenberg/integrate_release_1.31.0
SergioEstevao Jun 26, 2020
ef94da9
Update podfile.
SergioEstevao Jun 26, 2020
86d4bb7
Update GB reference to official release 1.31.0 tag.
SergioEstevao Jun 26, 2020
1f8b9ef
Merge branch 'develop' into gutenberg/integrate_release_1.31.0
SergioEstevao Jun 26, 2020
1caec19
Update release notes.
SergioEstevao Jun 26, 2020
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
8 changes: 5 additions & 3 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ end

def gutenberg(options)
options[:git] = 'http://github.com/wordpress-mobile/gutenberg-mobile/'
options[:submodules] = true
local_gutenberg = ENV['LOCAL_GUTENBERG']
if local_gutenberg
options = { :path => local_gutenberg.include?('/') ? local_gutenberg : '../gutenberg-mobile' }
Expand Down Expand Up @@ -119,7 +120,8 @@ def gutenberg_dependencies(options)
'RNSVG',
'ReactNativeDarkMode',
'react-native-slider',
'react-native-linear-gradient'
'react-native-linear-gradient',
'react-native-get-random-values'
]
if options[:path]
podspec_prefix = options[:path]
Expand All @@ -129,7 +131,7 @@ def gutenberg_dependencies(options)
end

for pod_name in dependencies do
pod pod_name, :podspec => "#{podspec_prefix}/react-native-gutenberg-bridge/third-party-podspecs/#{pod_name}.podspec.json"
pod pod_name, :podspec => "#{podspec_prefix}/third-party-podspecs/#{pod_name}.podspec.json"
end
end

Expand All @@ -146,7 +148,7 @@ target 'WordPress' do
## Gutenberg (React Native)
## =====================
##
gutenberg :commit => '74f2bb2c58b1fcd9a10125b78673318d5ef8d0a4'
gutenberg :tag => 'v1.31.0'

## Third party libraries
## =====================
Expand Down
Loading