From 672b28f236c7e630b3b61523a71d1623055096d0 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 2 May 2025 08:00:25 -0400 Subject: [PATCH 1/8] feat: Provide GutenbergKit current locale Enable localization within the editor. --- .../ViewRelated/NewGutenberg/NewGutenbergViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index c59a5db2a07a..cec09d5da859 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -167,6 +167,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor conf.themeStyles = FeatureFlag.newGutenbergThemeStyles.enabled // Limited to Simple sites until application password auth is supported conf.plugins = RemoteFeatureFlag.newGutenbergPlugins.enabled() && post.blog.isHostedAtWPcom + conf.locale = WordPressComLanguageDatabase().deviceLanguage.slug if !post.blog.isSelfHosted { let siteType: String = post.blog.isHostedAtWPcom ? "simple" : "atomic" From c42b4370b40fddab97b1e22d68d5269294b5d259 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 2 May 2025 10:57:28 -0400 Subject: [PATCH 2/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 0d88e290f045..c6a29df28ae6 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.2.0"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "ce3e042aad00e22142bda196b7285203785402db"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index cb31731be9ca..8bf0a648fc27 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "4d299ae36ff454e0e3ec59a9c04557210efa32d8b96b189963ad0f3ffebb3e70", + "originHash" : "342d0e14e55cc7dfe0801efb666f1c35634e854e9eb7ab9090537f0f5f9625bc", "pins" : [ { "identity" : "alamofire", @@ -150,8 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "a508888e828eb215e074c00042d9e3fd9a71568d", - "version" : "0.2.0" + "revision" : "ce3e042aad00e22142bda196b7285203785402db" } }, { From dabbbd94c1af01093ffb59be23da7a0af1529206 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 2 May 2025 17:13:01 -0400 Subject: [PATCH 3/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index c6a29df28ae6..6ef93edb816c 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "ce3e042aad00e22142bda196b7285203785402db"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "9c0bdc3c64db767c5a550afd8418348761e1cf78"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8bf0a648fc27..990b090aa6f5 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "ce3e042aad00e22142bda196b7285203785402db" + "revision" : "9c0bdc3c64db767c5a550afd8418348761e1cf78" } }, { From 8934b024400454d8c048e8fc815ab0f0a040ac8f Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Thu, 8 May 2025 12:36:00 -0400 Subject: [PATCH 4/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 6ef93edb816c..b438afd1722a 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "9c0bdc3c64db767c5a550afd8418348761e1cf78"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "0bb5fe6c07ecdbc57d3277182fa1722bef34d23d"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index 990b090aa6f5..fc5ad4f5a252 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "9c0bdc3c64db767c5a550afd8418348761e1cf78" + "revision" : "0bb5fe6c07ecdbc57d3277182fa1722bef34d23d" } }, { From 04fcf27bc88211cedf69b0bd664153f152a65d50 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Thu, 8 May 2025 15:56:05 -0400 Subject: [PATCH 5/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index b438afd1722a..563caf3075b8 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "0bb5fe6c07ecdbc57d3277182fa1722bef34d23d"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "1b3e577680ac3086094fa60d5f6b9359e16e3136"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index fc5ad4f5a252..726ce0bb293c 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "0bb5fe6c07ecdbc57d3277182fa1722bef34d23d" + "revision" : "1b3e577680ac3086094fa60d5f6b9359e16e3136" } }, { From f8e18724293c77634b80139f6d4160d9d48f2e3b Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 9 May 2025 10:10:04 -0400 Subject: [PATCH 6/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 563caf3075b8..15bdadd547c3 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "1b3e577680ac3086094fa60d5f6b9359e16e3136"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "48fd3e7c78ae01aff03403df804d65a7fcaaf581"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index 726ce0bb293c..0624ba1fab1d 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "1b3e577680ac3086094fa60d5f6b9359e16e3136" + "revision" : "48fd3e7c78ae01aff03403df804d65a7fcaaf581" } }, { @@ -221,7 +221,6 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/NSURL-IDN", "state" : { - "branch" : "cmm-322-remove-plus-from-name", "revision" : "b34794c9a3f32312e1593d4a3d120572afa0d010" } }, From aa8e1f0a8f5d5ae851b98bc17f81ba339928573a Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 9 May 2025 16:27:37 -0400 Subject: [PATCH 7/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 15bdadd547c3..584af2ce7c0d 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "48fd3e7c78ae01aff03403df804d65a7fcaaf581"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "e83c5f9a1f841e9ebc61f7135e16e45372240a10"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0624ba1fab1d..b2825ef66a1f 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "48fd3e7c78ae01aff03403df804d65a7fcaaf581" + "revision" : "e83c5f9a1f841e9ebc61f7135e16e45372240a10" } }, { From 28fba4096587208fc4fd00f2c685aee5fee73e39 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 12 May 2025 16:47:15 -0400 Subject: [PATCH 8/8] build: Update GutenbergKit version --- Modules/Package.swift | 2 +- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index 584af2ce7c0d..1362f87c481e 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -52,7 +52,7 @@ let package = Package( .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "e83c5f9a1f841e9ebc61f7135e16e45372240a10"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "fdfe788530bbff864ce7147b5a68608d7025e078"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"), ], diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index b2825ef66a1f..16364a66e800 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,7 +150,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "e83c5f9a1f841e9ebc61f7135e16e45372240a10" + "revision" : "fdfe788530bbff864ce7147b5a68608d7025e078" } }, {