Skip to content

Commit a93c8ed

Browse files
crazytonylicrazytonyli
committed
Add WordPressKit targets to Package.swift
1 parent d08a28b commit a93c8ed

File tree

2 files changed

+41
-25
lines changed

2 files changed

+41
-25
lines changed

‎Modules/Package.resolved‎

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/Package.swift‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ let package = Package(
4949
.package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
5050
.package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.9.0"),
5151
.package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
52-
.package(
53-
url: "https://github.com/wordpress-mobile/WordPressKit-iOS",
54-
branch: "rework-spm"
55-
),
5652
.package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
5753
// We can't use wordpress-rs branches nor commits here. Only tags work.
5854
.package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250813"),
@@ -88,9 +84,9 @@ let package = Package(
8884
dependencies: [
8985
"WordPressShared",
9086
"WordPressUI",
91-
.product(name: "Gridicons", package: "Gridicons-iOS"),
9287
// TODO: Remove — It's here just for a NSMutableParagraphStyle init helper
93-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
88+
"WordPressKit",
89+
.product(name: "Gridicons", package: "Gridicons-iOS"),
9490
],
9591
// Set to v5 to avoid @Sendable warnings and errors
9692
swiftSettings: [.swiftLanguageMode(.v5)]
@@ -99,7 +95,7 @@ let package = Package(
9995
name: "JetpackStats",
10096
dependencies: [
10197
"WordPressUI",
102-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
98+
"WordPressKit",
10399
],
104100
resources: [.process("Resources")]
105101
),
@@ -110,6 +106,7 @@ let package = Package(
110106
"BuildSettingsKit",
111107
"SFHFKeychainUtils",
112108
"WordPressShared",
109+
"WordPressKit",
113110
// Even though the extension is all in Swift, we need to include the Objective-C
114111
// version of CocoaLumberjack to avoid linking issues with other dependencies that
115112
// use it.
@@ -121,7 +118,6 @@ let package = Package(
121118
// in SharedCoreDataStack.o
122119
.product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
123120
.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
124-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
125121
],
126122
resources: [.process("Resources/Extensions.xcdatamodeld")]
127123
),
@@ -176,6 +172,35 @@ let package = Package(
176172
resources: [.process("Resources")],
177173
swiftSettings: [.swiftLanguageMode(.v5)]
178174
),
175+
.target(name: "WordPressKitObjCUtils"),
176+
.target(
177+
name: "WordPressKitModels",
178+
dependencies: [
179+
"NSObject-SafeExpectations",
180+
"WordPressKitObjCUtils",
181+
]
182+
),
183+
.target(
184+
name: "WordPressKitObjC",
185+
dependencies: [
186+
"NSObject-SafeExpectations",
187+
"wpxmlrpc",
188+
"WordPressKitModels",
189+
"WordPressKitObjCUtils",
190+
],
191+
publicHeadersPath: "include"
192+
),
193+
.target(
194+
name: "WordPressKit",
195+
dependencies: [
196+
"WordPressKitObjC",
197+
"WordPressKitModels",
198+
"WordPressKitObjCUtils",
199+
"NSObject-SafeExpectations",
200+
"wpxmlrpc",
201+
],
202+
swiftSettings: [.swiftLanguageMode(.v5)]
203+
),
179204
.target(
180205
name: "WordPressReader",
181206
dependencies: ["AsyncImageKit", "WordPressUI", "WordPressShared"],
@@ -240,10 +265,10 @@ enum XcodeSupport {
240265
"BuildSettingsKit",
241266
"WordPressShared",
242267
"WordPressUI",
268+
"WordPressKit",
243269
.product(name: "Gridicons", package: "Gridicons-iOS"),
244270
.product(name: "NSURL-IDN", package: "NSURL-IDN"),
245271
.product(name: "SVProgressHUD", package: "SVProgressHUD"),
246-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
247272
.product(name: "Gravatar", package: "Gravatar-SDK-iOS"),
248273
.product(name: "GravatarUI", package: "Gravatar-SDK-iOS"),
249274
]
@@ -257,6 +282,7 @@ enum XcodeSupport {
257282
"WordPressUI",
258283
"TextBundle",
259284
"TracksMini",
285+
"WordPressKit",
260286
// Even though the extensions are all in Swift, we need to include the Objective-C
261287
// version of CocoaLumberjack to avoid linking issues with other dependencies that
262288
// use it.
@@ -275,7 +301,6 @@ enum XcodeSupport {
275301
.product(name: "ZIPFoundation", package: "ZIPFoundation"),
276302
.product(name: "Aztec", package: "AztecEditor-iOS"),
277303
.product(name: "WordPressEditor", package: "AztecEditor-iOS"),
278-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
279304
]
280305

281306
let testDependencies: [Target.Dependency] = [
@@ -300,6 +325,7 @@ enum XcodeSupport {
300325
"WordPressReader",
301326
"WordPressUI",
302327
"WordPressCore",
328+
"WordPressKit",
303329
.product(name: "Alamofire", package: "Alamofire"),
304330
.product(name: "AutomatticAbout", package: "AutomatticAbout-swift"),
305331
.product(name: "AutomatticTracks", package: "Automattic-Tracks-iOS"),
@@ -322,7 +348,6 @@ enum XcodeSupport {
322348
.product(name: "SVProgressHUD", package: "SVProgressHUD"),
323349
.product(name: "SwiftSoup", package: "SwiftSoup"),
324350
.product(name: "UIDeviceIdentifier", package: "UIDeviceIdentifier"),
325-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
326351
.product(name: "ZendeskSupportSDK", package: "support_sdk_ios"),
327352
.product(name: "ZIPFoundation", package: "ZIPFoundation"),
328353
.product(name: "WordPressAPI", package: "wordpress-rs"),
@@ -345,16 +370,16 @@ enum XcodeSupport {
345370
"BuildSettingsKit",
346371
"FormattableContentKit",
347372
"SFHFKeychainUtils",
373+
"WordPressKit",
348374
.product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
349375
.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
350376
.product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
351377
.product(name: "NSURL-IDN", package: "NSURL-IDN"),
352378
.product(name: "WordPressAPI", package: "wordpress-rs"),
353-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
354379
]),
355380
.xcodeTarget("XcodeTarget_WordPressKitTests", dependencies: testDependencies + [
356381
"wpxmlrpc",
357-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
382+
"WordPressKit",
358383
]),
359384
.xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
360385
.xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
@@ -387,6 +412,7 @@ enum XcodeSupport {
387412
"TracksMini",
388413
"WordPressShared",
389414
"WordPressUI",
415+
"WordPressKit",
390416
// Even though the extensions are all in Swift, we need to include the Objective-C
391417
// version of CocoaLumberjack to avoid linking issues with other dependencies that
392418
// use it.
@@ -399,7 +425,6 @@ enum XcodeSupport {
399425
.product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
400426
.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
401427
.product(name: "WordPressAPI", package: "wordpress-rs"),
402-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
403428
]),
404429
.xcodeTarget("XcodeTarget_Intents", dependencies: [
405430
"BuildSettingsKit",
@@ -427,13 +452,13 @@ enum XcodeSupport {
427452
"FormattableContentKit",
428453
"SFHFKeychainUtils",
429454
"WordPressShared",
455+
"WordPressKit",
430456
.product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
431457
.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
432458
.product(name: "Gravatar", package: "Gravatar-SDK-iOS"),
433459
.product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
434460
.product(name: "NSURL-IDN", package: "NSURL-IDN"),
435461
.product(name: "WordPressAPI", package: "wordpress-rs"),
436-
.product(name: "WordPressKit", package: "WordPressKit-iOS"),
437462
]
438463
),
439464
]

0 commit comments

Comments
 (0)