Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Update GutenbergKit integration #23873

Draft
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Modules/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: "9f833599b9173c24253af9e2126ae2b9b4c6b413"),
.package(url: "https://github.com/Automattic/color-studio", branch: "trunk"),
],
targets: XcodeSupport.targets + [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)
}
}
3 changes: 1 addition & 2 deletions WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wordpress-mobile/GutenbergKit",
"state" : {
"branch" : "v0.0.2",
"revision" : "44b187993e6473cf0e4ef49516ca9de7fb5a4414"
"revision" : "9f833599b9173c24253af9e2126ae2b9b4c6b413"
}
},
{
Expand Down