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

Integrate Aztec 1.19.3 #23805

Merged
merged 2 commits into from
Jul 8, 2020
Merged

Integrate Aztec 1.19.3 #23805

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d049d
Integrate Aztec 1.19.3
chipsnyder Jul 8, 2020
521867f
Remove development dependency from Aztec
chipsnyder Jul 8, 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
2 changes: 1 addition & 1 deletion packages/react-native-aztec/RNTAztecView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2',
'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
s.dependency 'React-Core'
s.dependency 'WordPress-Aztec-iOS', '~> 1.19.2'
s.dependency 'WordPress-Aztec-iOS', '~> 1.19.3'

end
2 changes: 1 addition & 1 deletion packages/react-native-editor/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ target 'gutenberg' do
pod 'Folly', :podspec => '../../../node_modules/react-native/third-party-podspecs/Folly.podspec'
pod 'RNTAztecView', :path => '../../react-native-aztec/RNTAztecView.podspec'
#Use for testing non official versions of Aztec
pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => '9187001a9c6dc84c211937b1b5a2af2a8b8d54a9'
pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => '1.19.3'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only this reference when testing the changes in Aztec, the moment you update the dependency on the RNTAztecView.podspec file you should comment this line.

pod 'Gutenberg', :path => '../../react-native-bridge/Gutenberg.podspec'


Expand Down
22 changes: 11 additions & 11 deletions packages/react-native-editor/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- Gutenberg (8.4.0):
- Gutenberg (8.5.0):
- React (= 0.61.5)
- React-CoreModules (= 0.61.5)
- React-RCTImage (= 0.61.5)
Expand Down Expand Up @@ -243,10 +243,10 @@ PODS:
- React
- RNSVG (9.13.6-gb):
- React
- RNTAztecView (0.1.11):
- RNTAztecView (0.2.0):
- React-Core
- WordPress-Aztec-iOS (~> 1.19.2)
- WordPress-Aztec-iOS (1.19.2)
- WordPress-Aztec-iOS (~> 1.19.3)
- WordPress-Aztec-iOS (1.19.3)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -288,7 +288,7 @@ DEPENDENCIES:
- ReactNativeDarkMode (from `../../../node_modules/react-native-dark-mode`)
- RNSVG (from `../../../node_modules/react-native-svg`)
- RNTAztecView (from `../../react-native-aztec/RNTAztecView.podspec`)
- WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git`, commit `9187001a9c6dc84c211937b1b5a2af2a8b8d54a9`)
- WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git`, tag `1.19.3`)
- Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
Expand Down Expand Up @@ -367,15 +367,15 @@ EXTERNAL SOURCES:
RNTAztecView:
:path: "../../react-native-aztec/RNTAztecView.podspec"
WordPress-Aztec-iOS:
:commit: 9187001a9c6dc84c211937b1b5a2af2a8b8d54a9
:git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git
:tag: 1.19.3
Yoga:
:path: "../../../node_modules/react-native/ReactCommon/yoga"

CHECKOUT OPTIONS:
WordPress-Aztec-iOS:
:commit: 9187001a9c6dc84c211937b1b5a2af2a8b8d54a9
:git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git
:tag: 1.19.3

SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
Expand All @@ -385,7 +385,7 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
Gutenberg: 42a3ed491af07194744d45aa7fc44b8202ea1a5b
Gutenberg: c5583ab0c80c08e17e40c27ae2ec14a244acf8f5
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
Expand Down Expand Up @@ -413,10 +413,10 @@ SPEC CHECKSUMS:
ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
RNTAztecView: b4c945bdc156b98dbf5c8a676def6c7736efa337
WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
RNTAztecView: 30c445fb62fc5b2f43adf14bf30ce2888e7a4746
WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

PODFILE CHECKSUM: 0064bfb6384f9b3d6c15119c39ae4e6ffc9658da
PODFILE CHECKSUM: 2e5afd9581065964b81dbfdfd8524d50d8ec89a2

COCOAPODS: 1.8.4