Merge pull request #12258 from wordpress-mobile/gutenberg/integrate_r…

…elease_1.31.0 Gutenberg/integrate release 1.31.0
wordpress-mobile · Jun 26, 2020 · 93a012f · 93a012f
2 parents 186ce3b + 4fe7f16
commit 93a012f
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 74 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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
             - 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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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
@@ -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:

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -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

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -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 {

diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
@@ -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>
@@ -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>