Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ repositories {


dependencies {
implementation project(':react-native-webview')
implementation project(':react-native-linear-gradient')
implementation project(':@react-native-community_slider')
implementation project(':react-native-video')
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/java/com/gutenberg/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import androidx.core.util.Consumer;

import com.facebook.react.ReactApplication;
import com.reactnativecommunity.webview.RNCWebViewPackage;
import com.BV.LinearGradient.LinearGradientPackage;
import com.facebook.react.bridge.ReadableMap;
import com.reactnativecommunity.slider.ReactSliderPackage;
Expand Down Expand Up @@ -148,6 +149,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.asList(
new MainReactPackage(),
new RNCWebViewPackage(),
new ReactSliderPackage(),
new ReactVideoPackage(),
new SvgPackage(),
Expand Down
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'gutenberg'
include ':react-native-webview'
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')

apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 47 files
+2 −2 docs/contributors/managing-packages.md
+1 −1 docs/contributors/testing-overview.md
+1 −1 docs/designers-developers/designers/block-design.md
+2 −2 docs/designers-developers/developers/backward-compatibility/deprecations.md
+1 −1 docs/designers-developers/developers/block-api/block-deprecation.md
+1 −1 docs/designers-developers/developers/block-api/block-templates.md
+1 −1 docs/designers-developers/developers/platform/README.md
+1 −1 docs/designers-developers/developers/tutorials/block-tutorial/creating-dynamic-blocks.md
+2 −2 docs/designers-developers/developers/tutorials/block-tutorial/nested-blocks-inner-blocks.md
+1 −1 docs/designers-developers/developers/tutorials/format-api/2-toolbar-button.md
+1 −1 docs/designers-developers/developers/tutorials/metabox/meta-block-3-add.md
+1 −0 package-lock.json
+1 −0 packages/api-fetch/package.json
+7 −0 packages/api-fetch/src/index.js
+4 −4 packages/base-styles/_mixins.scss
+1 −0 packages/block-library/src/archives/index.js
+3 −3 packages/block-library/src/audio/edit.js
+1 −0 packages/block-library/src/categories/index.js
+1 −0 packages/block-library/src/latest-comments/index.js
+1 −0 packages/block-library/src/latest-posts/index.js
+84 −22 packages/block-library/src/missing/edit.native.js
+0 −0 packages/block-library/src/missing/unsupported.js
+1 −0 packages/block-library/src/tag-cloud/index.js
+140 −0 packages/block-library/src/unsupported-block-modal/index.native.js
+5 −1 packages/components/src/custom-gradient-picker/control-points.js
+6 −2 packages/components/src/custom-gradient-picker/custom-gradient-bar.js
+3 −0 packages/e2e-tests/specs/experiments/multi-entity-saving.test.js
+13 −0 packages/e2e-tests/specs/experiments/navigation.test.js
+11 −0 packages/icons/src/index.js
+16 −0 packages/icons/src/library/box.js
+12 −0 packages/icons/src/library/currency-dollar.js
+12 −0 packages/icons/src/library/currency-euro.js
+15 −0 packages/icons/src/library/currency-pound.js
+16 −0 packages/icons/src/library/inbox.js
+16 −0 packages/icons/src/library/institution.js
+2 −2 packages/icons/src/library/page.js
+16 −0 packages/icons/src/library/payment.js
+16 −0 packages/icons/src/library/percent.js
+16 −0 packages/icons/src/library/receipt.js
+12 −0 packages/icons/src/library/shipping.js
+12 −0 packages/icons/src/library/star.js
+12 −0 packages/icons/src/library/trending-down.js
+12 −0 packages/icons/src/library/trending-up.js
+1 −1 packages/interface/src/components/interface-skeleton/style.scss
+1 −0 packages/scripts/CHANGELOG.md
+56 −31 packages/scripts/scripts/check-licenses.js
+1 −0 test/native/setup.js
2 changes: 2 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ target 'gutenberg' do
#pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => 'edf1c9ae758b946e76bb9de6efc9135d2c2a4b43'
pod 'Gutenberg', :path => '../Gutenberg.podspec'

pod 'react-native-webview', :path => '../node_modules/react-native-webview'

target 'gutenbergTests' do
inherit! :search_paths
# Pods for testing
Expand Down
8 changes: 7 additions & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ PODS:
- react-native-video/Video (= 5.0.1)
- react-native-video/Video (5.0.1):
- React
- react-native-webview (9.2.2):
- React
- React-RCTActionSheet (0.61.5):
- React-Core/RCTActionSheetHeaders (= 0.61.5)
- React-RCTAnimation (0.61.5):
Expand Down Expand Up @@ -268,6 +270,7 @@ DEPENDENCIES:
- react-native-safe-area (from `../node_modules/react-native-safe-area`)
- "react-native-slider (from `../node_modules/@react-native-community/slider`)"
- react-native-video (from `../node_modules/react-native-video`)
- react-native-webview (from `../node_modules/react-native-webview`)
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
- React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
Expand Down Expand Up @@ -330,6 +333,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-community/slider"
react-native-video:
:path: "../node_modules/react-native-video"
react-native-webview:
:path: "../node_modules/react-native-webview"
React-RCTActionSheet:
:path: "../node_modules/react-native/Libraries/ActionSheetIOS"
React-RCTAnimation:
Expand Down Expand Up @@ -381,6 +386,7 @@ SPEC CHECKSUMS:
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
react-native-slider: f81b89fa0c1f9a65742d33f889a194ca6653a985
react-native-video: 331eaf96cb034fedcc27f4f6ada3ac3cf6c0a78a
react-native-webview: 881baa70f381b838964574f48153a2d453402922
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
Expand All @@ -397,6 +403,6 @@ SPEC CHECKSUMS:
WordPress-Aztec-iOS: 319620514af963ca519bd83b96a2c0ebdf3a0f03
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

PODFILE CHECKSUM: 7c7e4c82bf2c9ed08e515c352b72fc2d70b4ba48
PODFILE CHECKSUM: ff73e3c606a9fbf7641977388791ebf3a9ed8e35

COCOAPODS: 1.8.4
2 changes: 2 additions & 0 deletions ios/gutenberg.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@
"${BUILT_PRODUCTS_DIR}/react-native-keyboard-aware-scroll-view/react_native_keyboard_aware_scroll_view.framework",
"${BUILT_PRODUCTS_DIR}/react-native-safe-area/react_native_safe_area.framework",
"${BUILT_PRODUCTS_DIR}/react-native-slider/react_native_slider.framework",
"${BUILT_PRODUCTS_DIR}/react-native-webview/react_native_webview.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down Expand Up @@ -526,6 +527,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_keyboard_aware_scroll_view.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_safe_area.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_slider.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_webview.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
"moment-timezone": "^0.5.16",
"node-libs-react-native": "^1.0.2",
"node-sass": "^4.12.0",
"raw-loader": "^4.0.1",
"react": "16.9.0",
"react-native": "0.61.5",
"react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6",
Expand All @@ -178,6 +179,7 @@
"react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#a628e92990a2404e30a0086f168bd2b5b7b4ce96",
"react-native-url-polyfill": "^1.1.2",
"react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#c43bdf6b06d361da399b98b8d2e32b578fa188ac",
"react-native-webview": "^9.2.2",
"react-redux": "^5.0.7",
"redux": "^3.7.2",
"redux-multi": "^0.1.12",
Expand Down
Loading