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 #12258

Merged
merged 35 commits into from
Jun 26, 2020
Merged

Gutenberg/integrate release 1.31.0 #12258

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
128ce03
Updated RN aztec and bridge locations for monorepo
cameronvoell May 20, 2020
fc90ec5
Update gb-mobile to monorepo branch
cameronvoell May 20, 2020
7eed50b
Update gb ref for updating node version
cameronvoell May 20, 2020
d552343
Update lint baseline and gutenberg-mobile ref
Tug May 20, 2020
6d0d444
Update paths to react-native dependencies in settings.gradle
Tug Jun 1, 2020
ecd2327
Update gutenberg-mobile submodule
Tug Jun 1, 2020
177d8a3
Update circle-ci config
Tug Jun 1, 2020
104fdba
Update gutenberg-mobile ref
ceyhun Jun 3, 2020
509b2ef
Update gutenberg ref
cameronvoell Jun 5, 2020
d0058fe
Fix npm cache on CI
ceyhun Jun 5, 2020
512a52b
Fix android js bundle asset folder
ceyhun Jun 5, 2020
137fe78
Fix rn bridge asset folder path
ceyhun Jun 5, 2020
a0b81d6
Always checkout submodules recursively but shallow
ceyhun Jun 5, 2020
4edbb24
Fix lint errors
ceyhun Jun 5, 2020
b8c5400
Update gutenberg ref
cameronvoell Jun 15, 2020
a2dd90b
Update gutenberg ref
cameronvoell Jun 17, 2020
7c93c28
Fix build when wp.BUILD_GUTENBERG_FROM_SOURCE=true
ceyhun Jun 17, 2020
54904ed
Update gutenberg-mobile ref
ceyhun Jun 18, 2020
b6d79f3
Merge branch 'develop' into gutenberg/enable-build-from-monorepo
ceyhun Jun 18, 2020
3a75197
Bump gb-mobile hash
hypest Jun 18, 2020
f8a2ce4
Resolve the multiple kotlin_module file error
hypest Jun 18, 2020
91a1e2a
Updating gutenberg ref
cameronvoell Jun 18, 2020
7459ed0
react-native-recyclerview is not used anymore
hypest Jun 18, 2020
6e234e4
Update gutenberg ref
cameronvoell Jun 18, 2020
72f07e7
Only mkdir assets if not existing
cameronvoell Jun 18, 2020
18e12b0
Bump gb-mobile hash
hypest Jun 19, 2020
df19ea1
Bump gb-mobile hash
hypest Jun 19, 2020
d7d57f9
Update gutenberg-mobile ref
ceyhun Jun 19, 2020
e0c2c8e
Update gutenberg submodule ref
mchowning Jun 23, 2020
576ab90
Merge pull request #11956 from wordpress-mobile/gutenberg/enable-buil…
mchowning Jun 23, 2020
c7db82a
Updates from running tools/merge_strings_xml.py script
mchowning Jun 23, 2020
650c1ca
checkout-gutenberg-mobile-submodule-only is no more
hypest Jun 24, 2020
30b7790
Remove space on release notes.
SergioEstevao Jun 26, 2020
834f1fb
Update GB reference.
SergioEstevao Jun 26, 2020
4fe7f16
Update GB reference to official tag v1.31.0
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
75 changes: 35 additions & 40 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,33 @@ commands:
- run:
name: Setup gradle.properties
command: cp gradle.properties-example gradle.properties
yarn-install:
npm-install:
steps:
- restore_cache:
name: Restore Yarn Cache
name: Restore NPM Cache
keys:
- yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }}
- npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }}
- run:
name: Yarn Install
name: NPM Install
working_directory: libs/gutenberg-mobile
command: yarn install --frozen-lockfile --prefer-offline --network-concurrency 1
command: npm ci --prefer-offline
- save_cache:
name: Save Yarn Cache
key: yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }}
name: Save NPM Cache
key: npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }}
paths:
- libs/gutenberg-mobile/node_modules
- ~/.npm
hypest marked this conversation as resolved.
Show resolved Hide resolved
- libs/gutenberg-mobile/i18n-cache/data
checkout-submodules:
steps:
- run:
name: Checkout submodules
command: git submodule update --init --recursive
checkout-gutenberg-mobile-submodule-only:
command: git submodule update --init --recursive --depth 1
npm-bundle-android:
steps:
- run:
name: Checkout gutenberg-mobile submodule (no recursive)
command: git submodule update --init
yarn-bundle-android:
steps:
- run:
name: Yarn bundle Android
name: Npm bundle Android
working_directory: libs/gutenberg-mobile
command: yarn bundle:android
command: npm run bundle:android
save-gutenberg-bundle-cache:
steps:
- run:
Expand All @@ -62,7 +57,7 @@ commands:
name: Cache JS Bundle
key: android-js-bundle-{{ checksum "gutenberg_submodule_hash" }}
paths:
- libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle
- libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle
restore-gutenberg-bundle-cache:
steps:
- run:
Expand All @@ -85,37 +80,37 @@ jobs:
- run:
name: Abort If JS Bundle Exists
command: |
if [ -f "libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle" ]; then
if [ -f "libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle" ]; then
echo "Gutenberg-Mobile bundle already in cache, no need to create a new one."
circleci-agent step halt
else
echo "Gutenberg-Mobile bundle not found in cache. Proceeding to generate new bundle"
fi
- checkout-submodules
- yarn-install
- yarn-bundle-android
- npm-install
- npm-bundle-android
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
- run:
name: Move bundle to assets folder
command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle
command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle
- save-gutenberg-bundle-cache
test:
executor:
name: android/default
api-version: "28"
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- android/restore-gradle-cache
- copy-gradle-properties
- restore-gutenberg-bundle-cache
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- attach_workspace:
at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- run:
name: Test WordPress
environment:
Expand All @@ -134,15 +129,15 @@ jobs:
api-version: "28"
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- android/restore-gradle-cache
- copy-gradle-properties
- restore-gutenberg-bundle-cache
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- attach_workspace:
at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- run:
name: Checkstyle
environment:
Expand Down Expand Up @@ -177,7 +172,7 @@ jobs:
api-version: "28"
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- bundle-install/bundle-install:
cache_key_prefix: installable-build
- run:
Expand All @@ -187,9 +182,9 @@ jobs:
- restore-gutenberg-bundle-cache
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- attach_workspace:
at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- run:
name: Build APK
environment:
Expand Down Expand Up @@ -226,15 +221,15 @@ jobs:
api-version: "28"
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- android/restore-gradle-cache
- copy-gradle-properties
- restore-gutenberg-bundle-cache
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- attach_workspace:
at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- run:
name: Build
environment:
Expand Down Expand Up @@ -269,15 +264,15 @@ jobs:
api-version: "28"
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- android/restore-gradle-cache
- copy-gradle-properties
- restore-gutenberg-bundle-cache
- run:
name: Ensure assets folder exists
command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- attach_workspace:
at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
- run:
name: Build
environment:
Expand All @@ -301,7 +296,7 @@ jobs:
- image: circleci/ruby:2.6.4
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- run:
name: Install bundler
command: gem install bundler --version 2.0.2
Expand All @@ -318,7 +313,7 @@ jobs:
APP_VERSION_PREFIX: << pipeline.parameters.translation_review_lang_id >>
steps:
- git/shallow-checkout
- checkout-gutenberg-mobile-submodule-only
- checkout-submodules
- bundle-install/bundle-install:
cache_key_prefix: installable-build
- run:
Expand Down
1 change: 0 additions & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
15.2
-----
* [**] Fixes tons of rendering issues in Reader post detail by changing the technical solution (shared CSS file).

* [**] Block editor: Display content metrics information (blocks, words, characters count).
* [**] Block Editor: Adds editor support for theme defined colors and theme defined gradients on cover and button blocks.
* [**] Block Editor: Add support allowing Cover Block video uploads to complete after the editor has closed
Expand Down
3 changes: 3 additions & 0 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ android {
exclude '**/libjscexecutor.so'
exclude '**/libhermes-inspector.so'
exclude '**/libhermes-executor-debug.so'

pickFirst 'META-INF/-no-jdk.kotlin_module'

}

bundle {
Expand Down
36 changes: 18 additions & 18 deletions WordPress/lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
errorLine1=" view.setPadding("
errorLine2=" ^">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
line="550"
column="13"/>
</issue>
Expand Down Expand Up @@ -3927,7 +3927,7 @@
errorLine1=" Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
line="53"
column="48"/>
</issue>
Expand All @@ -3943,7 +3943,7 @@
errorLine1=" Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
line="53"
column="17"/>
</issue>
Expand All @@ -3959,7 +3959,7 @@
errorLine1=" view.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
line="337"
column="43"/>
</issue>
Expand All @@ -3975,7 +3975,7 @@
errorLine1=" view.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
line="342"
column="43"/>
</issue>
Expand All @@ -3991,7 +3991,7 @@
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.4.2&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build.gradle"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build.gradle"
line="18"
column="9"/>
</issue>
Expand All @@ -4007,7 +4007,7 @@
errorLine1=" implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
line="104"
column="5"/>
</issue>
Expand All @@ -4023,7 +4023,7 @@
errorLine1=" implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
line="109"
column="5"/>
</issue>
Expand All @@ -4039,7 +4039,7 @@
errorLine1=" implementation &apos;androidx.recyclerview:recyclerview:1.0.0&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
line="110"
column="5"/>
</issue>
Expand All @@ -4055,7 +4055,7 @@
errorLine1=" @ReactProp(name = PROP_TEXT)"
errorLine2=" ~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java"
line="18"
column="23"/>
</issue>
Expand All @@ -4071,7 +4071,7 @@
errorLine1=" private HashMap&lt;Integer, Media> mMediaToAddAfterMounting = new HashMap&lt;>();"
errorLine2=" ~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java"
line="85"
column="64"/>
</issue>
Expand All @@ -4087,7 +4087,7 @@
url="http://developer.android.com/design/style/iconography.html"
urls="http://developer.android.com/design/style/iconography.html">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-hdpi/ic_launcher.png"/>
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-hdpi/ic_launcher.png"/>
</issue>

<issue
Expand All @@ -4101,7 +4101,7 @@
url="http://developer.android.com/design/style/iconography.html"
urls="http://developer.android.com/design/style/iconography.html">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-mdpi/ic_launcher.png"/>
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-mdpi/ic_launcher.png"/>
</issue>

<issue
Expand All @@ -4115,7 +4115,7 @@
url="http://developer.android.com/design/style/iconography.html"
urls="http://developer.android.com/design/style/iconography.html">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-xhdpi/ic_launcher.png"/>
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xhdpi/ic_launcher.png"/>
</issue>

<issue
Expand All @@ -4129,7 +4129,7 @@
url="http://developer.android.com/design/style/iconography.html"
urls="http://developer.android.com/design/style/iconography.html">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-xxhdpi/ic_launcher.png"/>
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xxhdpi/ic_launcher.png"/>
</issue>

<issue
Expand All @@ -4143,7 +4143,7 @@
errorLine1="public class ReactAztecText extends AztecText {"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java"
line="49"
column="14"/>
</issue>
Expand All @@ -4159,7 +4159,7 @@
errorLine1=" (int) update.getPaddingLeft(),"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
line="551"
column="27"/>
</issue>
Expand All @@ -4175,7 +4175,7 @@
errorLine1=" (int) update.getPaddingRight(),"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
line="553"
column="27"/>
</issue>
Expand Down
Loading