Merge pull request #11174 from wordpress-mobile/gutenberg/after-1.21.0

[Gutenberg] After 1.21.0 back to develop

Gemfile.lock

@@ -216,4 +216,4 @@ DEPENDENCIES
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.1

RELEASE-NOTES.txt

@@ -3,6 +3,8 @@
 * Fixes an issue where searching for posts sometimes doesn't show some results.
 
 * Disable the option to remove a Jetpack site from site picker
+* Block editor: small performance improvements
+
 * Block Editor: Reduced padding around text on Rich Text based blocks.
 * Block Editor: Improved stability on very long posts.
 * Block Editor: New block "Shortcode". You can now create and edit Shortcode blocks in the editor.

WordPress/build.gradle

@@ -133,6 +133,11 @@ android {
     packagingOptions {
         // MPAndroidChart uses androidX - remove this line when we migrate everything to androidX
         exclude 'META-INF/proguard/androidx-annotations.pro'
+
+        // Exclude React Native's JSC and Hermes debug binaries
+        exclude '**/libjscexecutor.so'
+        exclude '**/libhermes-inspector.so'
+        exclude '**/libhermes-executor-debug.so'
     }
 
     bundle {

WordPress/proguard.cfg

@@ -69,6 +69,8 @@
 -dontwarn org.wordpress.aztec.glideloader.**
 
 -dontwarn com.github.godness84.RNRecyclerViewList.**
+
+-keep class com.facebook.hermes.unicode.** { *; }
 ###### React Native - end
 
 ###### Main resource class - begin

build.gradle

@@ -38,21 +38,11 @@ allprojects {
                 // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
                 url "$rootDir/libs/gutenberg-mobile/node_modules/react-native/android"
             }
-            maven {
-                // Local Maven repo containing AARs with JSC library built for Android
-                url "$rootDir/libs/gutenberg-mobile/node_modules/jsc-android/dist"
-            }
         } else {
             maven { url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" }
         }
     }
 
-    configurations.all {
-        resolutionStrategy {
-            force 'org.webkit:android-jsc:r241213'
-        }
-    }
-
     task checkstyle(type: Checkstyle) {
         source 'src'
 

libs/editor/WordPressEditor/build.gradle

@@ -78,6 +78,9 @@ dependencies {
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:$aztecVersion")
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion")
 
+    debugImplementation files("./libs/hermes-debug.aar")
+    releaseImplementation files("./libs/hermes-release.aar")
+
     if (rootProject.ext.has("buildGutenbergFromSource") && rootProject.ext.buildGutenbergFromSource) {
         implementation (project(':react-native-gutenberg-bridge')) {
             exclude group: 'com.squareup.okhttp3'