From 2ba73a5c7a805c990c707c8aa4b4a64c49647b30 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 6 Dec 2024 09:15:40 -0500 Subject: [PATCH 1/3] build: Update GutenbergKit ref --- 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 c0abba18de51..cfd923a94800 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -47,7 +47,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-20241116"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "v0.0.2"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "3c5373483f8cce0807d90c6e8143d61ab6294ea1"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), ], targets: XcodeSupport.targets + [ diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index a736c8a2d371..84beb641d232 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -149,8 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "branch" : "v0.0.2", - "revision" : "44b187993e6473cf0e4ef49516ca9de7fb5a4414" + "revision" : "3c5373483f8cce0807d90c6e8143d61ab6294ea1" } }, { From 0f6d601c06195341824e319f337722fda2b3dd58 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 6 Dec 2024 09:15:54 -0500 Subject: [PATCH 2/3] build: Integration GutenbergKitPlugin Used for downloading GutenbergKit artifacts. --- Modules/Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index cfd923a94800..b95ba607bf4b 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -162,6 +162,8 @@ enum XcodeSupport { .product(name: "ZIPFoundation", package: "ZIPFoundation"), .product(name: "WordPressAPI", package: "wordpress-rs"), .product(name: "ColorStudio", package: "color-studio"), + ], plugins: [ + .plugin(name: "GutenbergKitPlugin", package: "GutenbergKit"), ]), .xcodeTarget("XcodeTarget_WordPressTests", dependencies: testDependencies + [ "WordPressShared", @@ -197,7 +199,7 @@ enum XcodeSupport { } extension Target { - static func xcodeTarget(_ name: String, dependencies: [Dependency]) -> Target { - .target(name: name, dependencies: dependencies, path: "Sources/XcodeSupport/\(name)") + static func xcodeTarget(_ name: String, dependencies: [Dependency], plugins: [Target.PluginUsage] = []) -> Target { + .target(name: name, dependencies: dependencies, path: "Sources/XcodeSupport/\(name)", plugins: plugins) } } From 38ce7bc9595132714c9c41a5743c9600fe9974d1 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 6 Dec 2024 12:09:44 -0500 Subject: [PATCH 3/3] build: Update GutenbergKit ref --- 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 b95ba607bf4b..1ad64a0af57b 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -47,7 +47,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-20241116"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "3c5373483f8cce0807d90c6e8143d61ab6294ea1"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "9f833599b9173c24253af9e2126ae2b9b4c6b413"), .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"), ], targets: XcodeSupport.targets + [ diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index 84beb641d232..3060f2862cf0 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -149,7 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "3c5373483f8cce0807d90c6e8143d61ab6294ea1" + "revision" : "9f833599b9173c24253af9e2126ae2b9b4c6b413" } }, {