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

Jump to bottom

[Monorepo] Fix iOS build #18566

Merged
merged 8 commits into from
Mar 27, 2020
Merged

[Monorepo] Fix iOS build #18566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77fc2f6
Remove duplicate npm script
ceyhun Mar 24, 2020
d7fa069
Fix native packager argument for start:reset
ceyhun Mar 26, 2020
dc7b141
Move react-native-* podspecs under their package's folder
ceyhun Mar 26, 2020
dcb9e15
Update react-native-editor dependencies
ceyhun Mar 26, 2020
2c5d1d3
Update react-native-editor Podfile dependency paths
ceyhun Mar 26, 2020
d7c54c9
Update react-native-editor Xcode script path
ceyhun Mar 26, 2020
3556fd9
Delete moved podspecs
ceyhun Mar 26, 2020
2e66599
Merge remote-tracking branch 'origin/feat/import-gutenberg-mobile-no-…
Tug Mar 27, 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
58 changes: 45 additions & 13 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .../react-native-editor/RNTAztecView.podspec → ...s/react-native-aztec/RNTAztecView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Pod::Spec.new do |s|
s.version = package['version']
s.summary = 'Aztec editor for React Native'
s.license = package['license']
s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile'
s.homepage = package['homepage']
s.authors = 'Automattic'
s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' }
s.source_files = 'react-native-aztec/ios/RNTAztecView/*.{h,m,swift}'
s.public_header_files = 'react-native-aztec/ios/RNTAztecView/*.h'
s.source = { :git => 'https://github.com/WordPress/gutenberg.git' }
s.source_files = 'ios/RNTAztecView/*.{h,m,swift}'
s.public_header_files = 'ios/RNTAztecView/*.h'
s.requires_arc = true
s.platforms = { :ios => "11.0" }
s.swift_version = '5.0'
Expand Down
10 changes: 5 additions & 5 deletions ...ges/react-native-editor/Gutenberg.podspec → ...ges/react-native-bridge/Gutenberg.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
package = JSON.parse(File.read(File.join(File.expand_path('../..'), 'package.json')))
# Use the same RN version that the JS tools use
react_native_version = package['dependencies']['react-native']
react_native_version = package['devDependencies']['react-native']
# Extract the tagged version if package.json points to a tag
react_native_version = react_native_version.split("#v").last if react_native_version.include? "#v"

Pod::Spec.new do |s|
s.name = 'Gutenberg'
s.version = package['version']
s.summary = 'Printing since 1440'
s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile'
s.homepage = package['homepage']
s.license = package['license']
s.authors = 'Automattic'
s.platform = :ios, '11.0'
s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' }
s.source_files = 'react-native-gutenberg-bridge/ios/*.{h,m,swift}'
s.source = { :git => 'https://github.com/WordPress/gutenberg.git' }
s.source_files = 'ios/*.{h,m,swift}'
s.requires_arc = true
s.preserve_paths = 'bundle/ios/*'
s.swift_version = '5.0'
Expand Down
62 changes: 31 additions & 31 deletions packages/react-native-editor/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,43 @@ project 'gutenberg.xcodeproj'

# Uncomment the next line to define a global platform for your project
platform :ios, '11.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules'

target 'gutenberg' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

# Pods for gutenberg
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
pod 'React', :path => '../node_modules/react-native/'
pod 'React-Core', :path => '../node_modules/react-native/'
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
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 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
pod 'RNTAztecView', :path => '../RNTAztecView.podspec'
pod 'Gutenberg', :path => '../Gutenberg.podspec'
pod 'FBLazyVector', :path => "../../../node_modules/react-native/Libraries/FBLazyVector"
pod 'FBReactNativeSpec', :path => "../../../node_modules/react-native/Libraries/FBReactNativeSpec"
pod 'RCTRequired', :path => "../../../node_modules/react-native/Libraries/RCTRequired"
pod 'RCTTypeSafety', :path => "../../../node_modules/react-native/Libraries/TypeSafety"
pod 'React', :path => '../../../node_modules/react-native/'
pod 'React-Core', :path => '../../../node_modules/react-native/'
pod 'React-CoreModules', :path => '../../../node_modules/react-native/React/CoreModules'
pod 'React-Core/DevSupport', :path => '../../../node_modules/react-native/'
pod 'React-RCTActionSheet', :path => '../../../node_modules/react-native/Libraries/ActionSheetIOS'
pod 'React-RCTAnimation', :path => '../../../node_modules/react-native/Libraries/NativeAnimation'
pod 'React-RCTBlob', :path => '../../../node_modules/react-native/Libraries/Blob'
pod 'React-RCTImage', :path => '../../../node_modules/react-native/Libraries/Image'
pod 'React-RCTLinking', :path => '../../../node_modules/react-native/Libraries/LinkingIOS'
pod 'React-RCTNetwork', :path => '../../../node_modules/react-native/Libraries/Network'
pod 'React-RCTSettings', :path => '../../../node_modules/react-native/Libraries/Settings'
pod 'React-RCTText', :path => '../../../node_modules/react-native/Libraries/Text'
pod 'React-RCTVibration', :path => '../../../node_modules/react-native/Libraries/Vibration'
pod 'React-Core/RCTWebSocket', :path => '../../../node_modules/react-native/'
pod 'React-cxxreact', :path => '../../../node_modules/react-native/ReactCommon/cxxreact'
pod 'React-jsi', :path => '../../../node_modules/react-native/ReactCommon/jsi'
pod 'React-jsiexecutor', :path => '../../../node_modules/react-native/ReactCommon/jsiexecutor'
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 'DoubleConversion', :podspec => '../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../../../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../../../node_modules/react-native/third-party-podspecs/Folly.podspec'
pod 'RNTAztecView', :path => '../../react-native-aztec/RNTAztecView.podspec'
pod 'Gutenberg', :path => '../../react-native-bridge/Gutenberg.podspec'

target 'gutenbergTests' do
inherit! :search_paths
Expand Down
Loading