From 3be6f11407133a1601e59e73d6dc205251082ed6 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Mon, 22 Aug 2022 17:22:13 +0200
Subject: [PATCH 01/26] Remove hermes-mirror in favor of react-native-mirror
 having both hermes and react native binaries. It also comments out excluding
 the hermes debug libraries

---
 WordPress/build.gradle   | 11 +++--------
 libs/editor/build.gradle |  7 -------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index c7e59d92c90c..bede2452f66e 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -28,12 +28,6 @@ repositories {
             includeGroup "com.automattic.tracks"
         }
     }
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror"
-        content {
-            includeGroup "org.wordpress-mobile"
-        }
-    }
     maven {
         url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror"
         content {
@@ -253,8 +247,9 @@ android {
 
         // Exclude React Native's JSC and Hermes debug binaries
         exclude '**/libjscexecutor.so'
-        exclude '**/libhermes-inspector.so'
-        exclude '**/libhermes-executor-debug.so'
+        // TO-DO How to exclude this for release builds
+        // exclude '**/libhermes-inspector.so'
+        // exclude '**/libhermes-executor-debug.so'
 
         pickFirst 'META-INF/-no-jdk.kotlin_module'
 
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 9389e5fa6f2a..d054ede3886a 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -22,16 +22,9 @@ repositories {
             includeGroup "com.facebook.react"
         }
     }
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror"
-        content {
-            includeGroup "org.wordpress-mobile"
-        }
-    }
     google()
     mavenCentral()
     maven { url "https://www.jitpack.io" }
-    maven { url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror" }
 }
 
 android {

From 67db3c81607405501108f27bfc938f7d753e6951 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Tue, 23 Aug 2022 13:30:25 +0200
Subject: [PATCH 02/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bf1f1e910da8..5c007982eb7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = 'trunk-e11535105725e02dd1e8aa8065314ceb67079278'
-    gutenbergMobileVersion = 'v1.81.0'
+    gutenbergMobileVersion = '5113-aa7267a82208e77f809ac6e2e326daef95cc515b'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 52acffcd52e0f3804da95df0418681ba78731fe7 Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Tue, 20 Sep 2022 15:37:51 +1000
Subject: [PATCH 03/26] Update gutenberg-mobile ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5c007982eb7a..f8ba182d74f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = 'trunk-e11535105725e02dd1e8aa8065314ceb67079278'
-    gutenbergMobileVersion = '5113-aa7267a82208e77f809ac6e2e326daef95cc515b'
+    gutenbergMobileVersion = '5113-c8af14204e83a5f10cc2b88306bcc4b64304c255'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From cc396b98ca7b7b3ca78b973a3a7bd153964f3ed8 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 21 Sep 2022 12:44:02 +0200
Subject: [PATCH 04/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 83f3d0b07b39..fb02ce96d5a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
-    gutenbergMobileVersion = '5113-c8af14204e83a5f10cc2b88306bcc4b64304c255'
+    gutenbergMobileVersion = '5113-ac565f564bff567ca1ff1a30e6701813d25ce354'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 8d352e64801ebe16a37a4b05d45ff188e0174e83 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 21 Sep 2022 15:07:20 +0200
Subject: [PATCH 05/26] Exclude com.facebook.fbjni from Gutenberg Mobile binary

---
 libs/editor/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index d054ede3886a..68fb8d4779d7 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -84,7 +84,9 @@ dependencies {
 
     // This dependency will be substituted if the `local-builds.gradle` file contains
     // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
-    implementation "$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion"
+    implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") {
+        exclude group: 'com.facebook.fbjni'
+    }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
     implementation "org.jsoup:jsoup:1.10.3"

From 91efb5f5d5a23bc8112305b9c733c18863cc4947 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Fri, 23 Sep 2022 19:08:48 +0200
Subject: [PATCH 06/26] Update Gutenberg ref and fix building issues

---
 build.gradle             | 2 +-
 libs/editor/build.gradle | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index fb02ce96d5a7..02785086df31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
-    gutenbergMobileVersion = '5113-ac565f564bff567ca1ff1a30e6701813d25ce354'
+    gutenbergMobileVersion = '5170-03742fd12fd843c3e234931b2f65c6e76832d8aa'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 68fb8d4779d7..a904ec67957f 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -81,11 +81,15 @@ dependencies {
             strictly wordPressUtilsVersion
         }
     }
+    
+    implementation("com.facebook.react:hermes-engine:0.69.4") {
+        exclude group:'com.facebook.fbjni'
+    }
 
     // This dependency will be substituted if the `local-builds.gradle` file contains
     // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
     implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") {
-        exclude group: 'com.facebook.fbjni'
+        exclude module: 'hermes-engine'
     }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)

From 0aab5847e87e7652145bfff5954643aba42282a2 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 5 Oct 2022 09:03:46 +0200
Subject: [PATCH 07/26] Update Gutenberg mobile ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 02785086df31..2795b15bc292 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
-    gutenbergMobileVersion = '5170-03742fd12fd843c3e234931b2f65c6e76832d8aa'
+    gutenbergMobileVersion = '5170-a0fb2bea8b71bc6fe60cf235b73524f1aab55de1'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 5d16496c8409e37a099cc19bf8f1a4068642b1bf Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 5 Oct 2022 15:06:20 +0200
Subject: [PATCH 08/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 093444d20642..49da4013a216 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
     aztecVersion = 'v1.6.0'
-    gutenbergMobileVersion = 'v1.83.0'
+    gutenbergMobileVersion = '5170-0a55947fd6acc444f68bb9d066aa68758f6616a0'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 14fed3fd0c6bc9f38063f0f3e52b58bacc75eee7 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 5 Oct 2022 18:51:54 +0200
Subject: [PATCH 09/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 49da4013a216..ab0e472c189d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
     aztecVersion = 'v1.6.0'
-    gutenbergMobileVersion = '5170-0a55947fd6acc444f68bb9d066aa68758f6616a0'
+    gutenbergMobileVersion = '5170-57082fa36966e455d05c36486ed2be2a81d43ef8'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 037f3de94ab78cdf2892c2119255c40984e3546d Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Tue, 11 Oct 2022 15:44:36 +0200
Subject: [PATCH 10/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ab0e472c189d..7e9e1ac6ddd8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
     aztecVersion = 'v1.6.0'
-    gutenbergMobileVersion = '5170-57082fa36966e455d05c36486ed2be2a81d43ef8'
+    gutenbergMobileVersion = '5170-0fc2b10b9049a4b2d9fa8f51d92f7ddd7d4f2d1b'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 5dfcaf9ae311cfd87acfe9b766325e6126f5848f Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Tue, 11 Oct 2022 16:11:30 +0200
Subject: [PATCH 11/26] Exclude fabricjni.so

---
 WordPress/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 14efa918025c..d83d057f9fc4 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -250,9 +250,7 @@ android {
 
         // Exclude React Native's JSC and Hermes debug binaries
         exclude '**/libjscexecutor.so'
-        // TO-DO How to exclude this for release builds
-        // exclude '**/libhermes-inspector.so'
-        // exclude '**/libhermes-executor-debug.so'
+        exclude '**/libfabricjni.so' // Since we are not using Fabric yet
 
         pickFirst 'META-INF/-no-jdk.kotlin_module'
 

From 432afbfac083fc59683c3d4f9cc99a8b96123eb9 Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Wed, 19 Oct 2022 15:23:56 +1000
Subject: [PATCH 12/26] Update gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7e9e1ac6ddd8..20d6d20b084a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '2.7.0'
     wordPressLoginVersion = '0.19.0'
     aztecVersion = 'v1.6.0'
-    gutenbergMobileVersion = '5170-0fc2b10b9049a4b2d9fa8f51d92f7ddd7d4f2d1b'
+    gutenbergMobileVersion = '5193-a8efc54b1d85d62c10279726d2a5c5bd3db20689'
     storiesVersion = '1.4.0'
     aboutAutomatticVersion = '0.0.6'
 

From 863a75c2418a13bbaa7d3e0e0c5e91bc55f79cc4 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Mon, 22 Aug 2022 17:22:13 +0200
Subject: [PATCH 13/26] Remove hermes-mirror in favor of react-native-mirror
 having both hermes and react native binaries. It also comments out excluding
 the hermes debug libraries

---
 WordPress/build.gradle   | 11 +++--------
 libs/editor/build.gradle |  7 -------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 2c2cb59b70d3..a028de47c476 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -28,12 +28,6 @@ repositories {
             includeGroup "com.automattic.tracks"
         }
     }
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror"
-        content {
-            includeGroup "org.wordpress-mobile"
-        }
-    }
     maven {
         url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror"
         content {
@@ -259,8 +253,9 @@ android {
 
         // Exclude React Native's JSC and Hermes debug binaries
         exclude '**/libjscexecutor.so'
-        exclude '**/libhermes-inspector.so'
-        exclude '**/libhermes-executor-debug.so'
+        // TO-DO How to exclude this for release builds
+        // exclude '**/libhermes-inspector.so'
+        // exclude '**/libhermes-executor-debug.so'
 
         pickFirst 'META-INF/-no-jdk.kotlin_module'
 
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index efc0cdc1440b..a07bf08a0f1d 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -20,16 +20,9 @@ repositories {
             includeGroup "com.facebook.react"
         }
     }
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror"
-        content {
-            includeGroup "org.wordpress-mobile"
-        }
-    }
     google()
     mavenCentral()
     maven { url "https://www.jitpack.io" }
-    maven { url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror" }
 }
 
 android {

From 45d42312da76a500b9869ea81efe4f0f3a373355 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 21 Sep 2022 15:07:20 +0200
Subject: [PATCH 14/26] Exclude com.facebook.fbjni from Gutenberg Mobile binary

---
 libs/editor/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index a07bf08a0f1d..485cc7018bbe 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -81,7 +81,9 @@ dependencies {
 
     // This dependency will be substituted if the `local-builds.gradle` file contains
     // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
-    implementation "$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion"
+    implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") {
+        exclude group: 'com.facebook.fbjni'
+    }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
     implementation "org.jsoup:jsoup:1.10.3"

From 64602e10d8de5219ceeb61f985289474a08993f8 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Fri, 23 Sep 2022 19:08:48 +0200
Subject: [PATCH 15/26] Update Gutenberg ref and fix building issues

---
 libs/editor/build.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 485cc7018bbe..10c1e0914f28 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -78,11 +78,15 @@ dependencies {
             strictly wordPressUtilsVersion
         }
     }
+    
+    implementation("com.facebook.react:hermes-engine:0.69.4") {
+        exclude group:'com.facebook.fbjni'
+    }
 
     // This dependency will be substituted if the `local-builds.gradle` file contains
     // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
     implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") {
-        exclude group: 'com.facebook.fbjni'
+        exclude module: 'hermes-engine'
     }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)

From ab9b05c2c2795c3cb3c1448adccf301bf39b3240 Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Wed, 19 Oct 2022 17:07:26 +1000
Subject: [PATCH 16/26] Update gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 79a3faf700a6..23dec76fbf3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '3.0.0'
     wordPressLoginVersion = '1.0.0'
     aztecVersion = 'v1.6.2'
-    gutenbergMobileVersion = 'v1.84.0'
+    gutenbergMobileVersion = '5193-a8efc54b1d85d62c10279726d2a5c5bd3db20689'
     storiesVersion = '2.0.0'
     aboutAutomatticVersion = '1.0.0'
 

From 4ca7bddbd1db3cc98cf893db1544a8c3fd4119b8 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 19 Oct 2022 13:12:55 +0200
Subject: [PATCH 17/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 23dec76fbf3a..ee377bffa774 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '3.0.0'
     wordPressLoginVersion = '1.0.0'
     aztecVersion = 'v1.6.2'
-    gutenbergMobileVersion = '5193-a8efc54b1d85d62c10279726d2a5c5bd3db20689'
+    gutenbergMobileVersion = '5193-ee012553634f1c489744abd7945f0f8a1cc05499'
     storiesVersion = '2.0.0'
     aboutAutomatticVersion = '1.0.0'
 

From 5dad8d585c0f0b523f34c951dad614970b3be383 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Thu, 20 Oct 2022 18:06:00 +0200
Subject: [PATCH 18/26] Fix Soloader version to fix issue with instrumented
 tests

---
 libs/editor/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 10c1e0914f28..1308cee081cc 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -79,6 +79,13 @@ dependencies {
         }
     }
     
+    // Forcing version due to https://github.com/facebook/SoLoader/issues/94
+    // To be removed with React Native 0.70+
+    implementation("com.facebook.soloader:soloader") {
+        version {
+            strictly '0.10.4'
+        }
+    }
     implementation("com.facebook.react:hermes-engine:0.69.4") {
         exclude group:'com.facebook.fbjni'
     }

From f884bfdc9fd2e91c6a4b08af08c9cbd7f1231e11 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Thu, 27 Oct 2022 17:44:24 +0200
Subject: [PATCH 19/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 86e23c9cd886..68199dbab2a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ ext {
     wordPressUtilsVersion = '3.0.0'
     wordPressLoginVersion = '1.0.0'
     aztecVersion = 'v1.6.2'
-    gutenbergMobileVersion = '5193-d77a68b14bbf33f162df4f043d467ae90a77dad1'
+    gutenbergMobileVersion = '5193-9271ca3711f5dc45d147a58ac6962f69c0dda080'
     storiesVersion = '2.0.0'
     aboutAutomatticVersion = '1.0.0'
 

From 14d60e656a5261c77f038afbae4ffa5f589b8bbf Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Thu, 3 Nov 2022 15:11:58 +0100
Subject: [PATCH 20/26] React Native Upgrade - Avoid duplicated classes

---
 WordPress/build.gradle   |  4 ++++
 libs/editor/build.gradle | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 9a528ef6c7c7..88f93d57b764 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -260,6 +260,10 @@ android {
         // Exclude React Native's JSC and Hermes debug binaries
         exclude '**/libjscexecutor.so'
         exclude '**/libfabricjni.so' // Since we are not using Fabric yet
+        
+        // Avoid React Native's JNI duplicated classes
+        pickFirst '**/libc++_shared.so'
+        pickFirst '**/libfbjni.so'
 
         pickFirst 'META-INF/-no-jdk.kotlin_module'
 
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 1308cee081cc..c8b3ff8a178c 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -86,14 +86,18 @@ dependencies {
             strictly '0.10.4'
         }
     }
-    implementation("com.facebook.react:hermes-engine:0.69.4") {
-        exclude group:'com.facebook.fbjni'
-    }
+
+    implementation 'com.facebook.fresco:fresco:2.5.0'
+    implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.5.0'
+    implementation 'com.facebook.fbjni:fbjni:0.2.2'
+    implementation 'com.facebook.react:hermes-engine:0.69.4:release@aar'
+    implementation 'com.facebook.react:react-native:0.69.4:release@aar'
 
     // This dependency will be substituted if the `local-builds.gradle` file contains
     // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
     implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") {
         exclude module: 'hermes-engine'
+        exclude module: 'react-native'
     }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)

From b31f20dca1b4c67cbc76fec6bc1cbcb1004e1e06 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Wed, 16 Nov 2022 18:00:42 +0100
Subject: [PATCH 21/26] Remove unneeded code

---
 WordPress/build.gradle | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index f599453052ca..49d2bee2f38c 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -257,12 +257,9 @@ android {
         // 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
-        // TO-DO How to exclude this for release builds
-        // exclude '**/libhermes-inspector.so'
-        // exclude '**/libhermes-executor-debug.so'
+        // Exclude React Native's JSC and Fabric JNI
         exclude '**/libjscexecutor.so'
-        exclude '**/libfabricjni.so' // Since we are not using Fabric yet
+        exclude '**/libfabricjni.so'
         
         // Avoid React Native's JNI duplicated classes
         pickFirst '**/libc++_shared.so'

From 1483a611d2f6880a67eb0e3118d2cc15a05e697f Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo.pacheco@automattic.com>
Date: Tue, 29 Nov 2022 10:52:22 +0100
Subject: [PATCH 22/26] Update Gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 906e58c474ff..dbe849b4bbfb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ ext {
     wordPressUtilsVersion = '3.1.0'
     wordPressLoginVersion = '1.0.0'
     aztecVersion = 'v1.6.2'
-    gutenbergMobileVersion = '5193-dc45609f4529526a32fd3a7b4a956398ca9e10af'
+    gutenbergMobileVersion = '5193-58ab7096cf86b3e69e8d20877740d698ddd39168'
     storiesVersion = '2.0.0'
     aboutAutomatticVersion = '1.0.0'
 

From 9de67b217db5bf86788c4f53a55e5a06b7463f6c Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Mon, 5 Dec 2022 15:13:43 +1000
Subject: [PATCH 23/26] Update gutenberg ref

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dbe849b4bbfb..315652f7bcac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ ext {
     wordPressUtilsVersion = '3.1.0'
     wordPressLoginVersion = '1.0.0'
     aztecVersion = 'v1.6.2'
-    gutenbergMobileVersion = '5193-58ab7096cf86b3e69e8d20877740d698ddd39168'
+    gutenbergMobileVersion = 'trunk-ed6de0ebcdfd1b6d2899bcdf045ccc307e923ea9'
     storiesVersion = '2.0.0'
     aboutAutomatticVersion = '1.0.0'
 

From b8ecbfcbddc6032aeee74d4417d95e41f2ce8604 Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Mon, 5 Dec 2022 21:18:11 +1000
Subject: [PATCH 24/26] Update gutenberg-mobile tag to 1.86.0-alpha1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 496d188b6ad0..4dc42b9df1b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ ext {
     automatticRestVersion = '1.0.8'
     automatticStoriesVersion = '2.0.0'
     automatticTracksVersion = '2.2.0'
-    gutenbergMobileVersion = 'trunk-ed6de0ebcdfd1b6d2899bcdf045ccc307e923ea9'
+    gutenbergMobileVersion = 'v.1.86.0-alpha-1'
     wordPressAztecVersion = 'v1.6.2'
     wordPressEmailChecker2Version = '1.1.0'
     wordPressFluxCVersion = '2.6.0'

From ee6e2acaa62537b486505e7511bb7ab5258e5f1f Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Tue, 6 Dec 2022 15:23:33 +1000
Subject: [PATCH 25/26] Fix typo in Gutenberg tag reference

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4dc42b9df1b7..92a9f0d24c86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ ext {
     automatticRestVersion = '1.0.8'
     automatticStoriesVersion = '2.0.0'
     automatticTracksVersion = '2.2.0'
-    gutenbergMobileVersion = 'v.1.86.0-alpha-1'
+    gutenbergMobileVersion = 'v1.86.0-alpha-1'
     wordPressAztecVersion = 'v1.6.2'
     wordPressEmailChecker2Version = '1.1.0'
     wordPressFluxCVersion = '2.6.0'

From e3e505d04eb438d7c26156a79ea9bef3413b091d Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Wed, 7 Dec 2022 13:12:36 +1000
Subject: [PATCH 26/26] Update gutenberg tag

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 92a9f0d24c86..9fb8b0889033 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ ext {
     automatticRestVersion = '1.0.8'
     automatticStoriesVersion = '2.0.0'
     automatticTracksVersion = '2.2.0'
-    gutenbergMobileVersion = 'v1.86.0-alpha-1'
+    gutenbergMobileVersion = 'v1.86.0-alpha1'
     wordPressAztecVersion = 'v1.6.2'
     wordPressEmailChecker2Version = '1.1.0'
     wordPressFluxCVersion = '2.6.0'