From 49755f9a05119b13ea461bce8b7f3d194436a89e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 8 Jan 2026 17:26:25 +1100 Subject: [PATCH 01/10] Switch GutenbergKit to branch using HTML resources XCFramework --- Modules/Package.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index e6a728bf73cd..52bccb9fd0d4 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -55,7 +55,11 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.9.0"), .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"), .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.10.1"), + // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 + .package( + url: "https://github.com/wordpress-mobile/GutenbergKit", + revision: "6cbc42aa40441375dbc071f7f390a5e7f1f9403e" + ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), .package( From a77b4f1ffc06315ae5b9473c3c25ac07460e7a10 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 8 Jan 2026 18:44:43 +1100 Subject: [PATCH 02/10] Use GutenbergKit version with binary HTML resources --- Modules/Package.resolved | 5 ++--- Modules/Package.swift | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 773acdfae160..a64134c04f3d 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "fa20aa25a9175838313543f726c7d0e88ab8ab5d611ea8d159bc549c27b0cda7", + "originHash" : "1b6ebc8d35d0955553c276fa324b13d701da41b4b9562c9359fd984e91fad1b2", "pins" : [ { "identity" : "alamofire", @@ -149,8 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "df43b1d70fef11fb9035b1d9da7d4a80503c2a6f", - "version" : "0.10.1" + "revision" : "d3d89624e3b365ccc3cfac5ce06f2033531ec682" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 52bccb9fd0d4..2a66825d2c79 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -58,7 +58,7 @@ let package = Package( // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "6cbc42aa40441375dbc071f7f390a5e7f1f9403e" + revision: "d3d89624e3b365ccc3cfac5ce06f2033531ec682" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From 94b4efb825d009e544ad9e4b493cc81256116411 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 9 Jan 2026 08:16:07 +1100 Subject: [PATCH 03/10] Try tweaked version --- Modules/Package.resolved | 4 ++-- Modules/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index a64134c04f3d..298f5ca248bc 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "1b6ebc8d35d0955553c276fa324b13d701da41b4b9562c9359fd984e91fad1b2", + "originHash" : "cdaf505f2576544ac7b5c5b0d72b289cfe5bfdd415a1c3f41fdc29b407c6f053", "pins" : [ { "identity" : "alamofire", @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "d3d89624e3b365ccc3cfac5ce06f2033531ec682" + "revision" : "b3e463427bc470d4915b7749197fafe608b5587e" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 2a66825d2c79..eae05af04bab 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -58,7 +58,7 @@ let package = Package( // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "d3d89624e3b365ccc3cfac5ce06f2033531ec682" + revision: "b3e463427bc470d4915b7749197fafe608b5587e" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From 5fb71dc7aeb04642ddf14c790da66c02debcd0b6 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 9 Jan 2026 09:11:08 +1100 Subject: [PATCH 04/10] Use tweaked version --- Modules/Package.resolved | 4 ++-- Modules/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 298f5ca248bc..73014657a01a 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "cdaf505f2576544ac7b5c5b0d72b289cfe5bfdd415a1c3f41fdc29b407c6f053", + "originHash" : "8b2958ec1d125c49896917ef48c5d445b32f89f12b40b759a59233c279d067bb", "pins" : [ { "identity" : "alamofire", @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "b3e463427bc470d4915b7749197fafe608b5587e" + "revision" : "4f2fa9837c5df1b8d6137820ef238102611cc480" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index eae05af04bab..6bc6d3b8dcce 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -58,7 +58,7 @@ let package = Package( // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "b3e463427bc470d4915b7749197fafe608b5587e" + revision: "4f2fa9837c5df1b8d6137820ef238102611cc480" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From 74657131b4cacf611ec10fa59793cfda6c30c570 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 9 Jan 2026 09:50:42 +1100 Subject: [PATCH 05/10] Use updated version --- Modules/Package.resolved | 4 ++-- Modules/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 73014657a01a..b70dc9e45be4 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "8b2958ec1d125c49896917ef48c5d445b32f89f12b40b759a59233c279d067bb", + "originHash" : "d824bb905f41a0ebc1d7becab354a30233f095e21ab7a9a2958a5df4a96a60ad", "pins" : [ { "identity" : "alamofire", @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "4f2fa9837c5df1b8d6137820ef238102611cc480" + "revision" : "9ee0c61f9be6a0d5d0e0d022a4f9b7378b3ef429" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 6bc6d3b8dcce..6b91b92f2350 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -58,7 +58,7 @@ let package = Package( // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "4f2fa9837c5df1b8d6137820ef238102611cc480" + revision: "9ee0c61f9be6a0d5d0e0d022a4f9b7378b3ef429" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From af867689c453c88480114131057b5b381462592b Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 9 Jan 2026 10:14:50 +1100 Subject: [PATCH 06/10] Update to GutenbergKit API changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - EditorConfigurationBuilder now requires postType, siteURL, siteApiRoot - LogLevel was renamed to EditorLogLevel 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude Opus 4.5 --- .../Editor/CommentGutenbergEditorViewController.swift | 10 ++++++++-- .../NewGutenberg/NewGutenbergViewController.swift | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift index f37e02d0f65c..b68c720b4cf6 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift @@ -35,7 +35,13 @@ final class CommentGutenbergEditorViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - let configuration = EditorConfigurationBuilder(content: initialContent ?? "") + // Using placeholder values since comments don't need site context + let configuration = EditorConfigurationBuilder( + postType: "comment", + siteURL: URL(string: "https://placeholder.wordpress.com")!, + siteApiRoot: URL(string: "https://placeholder.wordpress.com/wp-json")! + ) + .setContent(initialContent ?? "") .setShouldHideTitle(true) .build() @@ -89,7 +95,7 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle // Do nothing } - func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) { + func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) { // Do nothing } diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index 9fd0fe9c3374..fec9dda949f5 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -572,7 +572,7 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate } } - func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) { + func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) { // Do nothing } From 652a96624a14e416f04ec0cb389711c7a3db7398 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 12 Jan 2026 10:47:00 +1100 Subject: [PATCH 07/10] Revert "Update to GutenbergKit API changes" This reverts commit af867689c453c88480114131057b5b381462592b. --- .../Editor/CommentGutenbergEditorViewController.swift | 10 ++-------- .../NewGutenberg/NewGutenbergViewController.swift | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift index b68c720b4cf6..f37e02d0f65c 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift @@ -35,13 +35,7 @@ final class CommentGutenbergEditorViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - // Using placeholder values since comments don't need site context - let configuration = EditorConfigurationBuilder( - postType: "comment", - siteURL: URL(string: "https://placeholder.wordpress.com")!, - siteApiRoot: URL(string: "https://placeholder.wordpress.com/wp-json")! - ) - .setContent(initialContent ?? "") + let configuration = EditorConfigurationBuilder(content: initialContent ?? "") .setShouldHideTitle(true) .build() @@ -95,7 +89,7 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle // Do nothing } - func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) { + func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) { // Do nothing } diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index fec9dda949f5..9fd0fe9c3374 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -572,7 +572,7 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate } } - func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) { + func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) { // Do nothing } From 6977967361693193a338fc8ede8f26dba6abf280 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 12 Jan 2026 11:11:44 +1100 Subject: [PATCH 08/10] Use GutenbergKit version built of 0.10.1 --- Modules/Package.resolved | 4 ++-- Modules/Package.swift | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index b70dc9e45be4..82239c871c42 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "d824bb905f41a0ebc1d7becab354a30233f095e21ab7a9a2958a5df4a96a60ad", + "originHash" : "a76ec95958f7c45feb2d559550eaa9a1c5cd5349445e7cc89d0701ee3934ff71", "pins" : [ { "identity" : "alamofire", @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "9ee0c61f9be6a0d5d0e0d022a4f9b7378b3ef429" + "revision" : "b1e527471b27ec733633b74f9b71ad91f53095fb" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 6b91b92f2350..f0f01818429c 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -56,9 +56,11 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"), .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // To test https://github.com/wordpress-mobile/GutenbergKit/pull/271 + // + // Notice that the version of GutenbergKit we use is based off 0.10.1 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "9ee0c61f9be6a0d5d0e0d022a4f9b7378b3ef429" + revision: "b1e527471b27ec733633b74f9b71ad91f53095fb" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From 4612d45abcbde930cfb646ea1dd37674f86f7155 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 13 Jan 2026 13:30:33 +1100 Subject: [PATCH 09/10] Use new GutenbergKit version --- Modules/Package.resolved | 4 ++-- Modules/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 82239c871c42..c80e6c47bcb3 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "a76ec95958f7c45feb2d559550eaa9a1c5cd5349445e7cc89d0701ee3934ff71", + "originHash" : "7e2ab9a75419ebb17360a2c49f2db0629b4f3ca996936e5d9f290b5f09a2a171", "pins" : [ { "identity" : "alamofire", @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "b1e527471b27ec733633b74f9b71ad91f53095fb" + "revision" : "eb23e681911b2bd59b4ef6369b8b0a5bea9b4078" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index f0f01818429c..6152ef4bfa5d 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -60,7 +60,7 @@ let package = Package( // Notice that the version of GutenbergKit we use is based off 0.10.1 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "b1e527471b27ec733633b74f9b71ad91f53095fb" + revision: "eb23e681911b2bd59b4ef6369b8b0a5bea9b4078" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"), From ebba057c6da64c71571fd993a071458e2067579c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 13 Jan 2026 15:00:52 +1100 Subject: [PATCH 10/10] Use a new GutenbergKit version --- Modules/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 6152ef4bfa5d..2cc8e1411d6c 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -60,7 +60,7 @@ let package = Package( // Notice that the version of GutenbergKit we use is based off 0.10.1 .package( url: "https://github.com/wordpress-mobile/GutenbergKit", - revision: "eb23e681911b2bd59b4ef6369b8b0a5bea9b4078" + revision: "503eb5a9451b79bcedc907d3304441e43efbfd25" ), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"),