Merge branch 'trunk' into feature/prefix-support

Gerardo · Gerardo · commit f5d523f7edf9 · 2024-06-20T11:14:18.000+02:00
# Conflicts:
#	gutenberg
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,6 +2,10 @@ Unreleased
 ---
 * [internal] Fix Inserter items list filtering [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6911]
 * [*] Prevent hiding the keyboard when creating new list items [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6922]
+* [*] Fix issue when pasting HTML content [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6933]
+
+1.120.1
+---
 * [*] RichText - Fix undefined onDelete callback [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6925]
 * [**] Add support prefix transforms [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6932]
 
diff --git a/gutenberg b/gutenberg
@@ -1 +1 @@
-Subproject commit aa24f93fc71e73185c54a065bac0793d3c38849a
+Subproject commit 35db76a868703b6f5de43e2f0f8f469d2ca06a9f
diff --git a/ios-xcframework/Gemfile.lock b/ios-xcframework/Gemfile.lock
@@ -266,7 +266,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -283,6 +284,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock
@@ -1104,7 +1104,7 @@ PODS:
     - React-RCTImage
   - RNSVG (14.0.0):
     - React-Core
-  - RNTAztecView (1.120.0):
+  - RNTAztecView (1.120.1):
     - React-Core
     - WordPress-Aztec-iOS (= 1.19.11)
   - SDWebImage (5.11.1):
@@ -1399,7 +1399,7 @@ SPEC CHECKSUMS:
   RNReanimated: f705119af7f77c961122a09adbfdf3dd38ce6a60
   RNScreens: d07e03170921286b65f07e7b2a3aa8300f61f2ec
   RNSVG: eb0b170443191e4a1af53b9bd17d1f2fbd1ba152
-  RNTAztecView: 3a1df2dd827082d22a4dd06b6031e2fefd2885c6
+  RNTAztecView: e7495baad7608c5e7e9e9a43ee537282dae7ccdc
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg-mobile",
-	"version": "1.120.0",
+	"version": "1.120.1",
 	"private": true,
 	"config": {
 		"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gutenberg-mobile",`
`3`		`- "version": "1.120.0",`
	`3`	`+ "version": "1.120.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"config": {`
`6`	`6`	`"jsfiles": "./.js src/.js src/*/.js src///*.js",`