Skip to content

Commit ca5a180

Browse files
committed
Fix CocoaPods support
1 parent 266c467 commit ca5a180

File tree

6 files changed

+30
-8
lines changed

6 files changed

+30
-8
lines changed

native/swift/Sources/wordpress-api/Protocols/Conformances/PostType.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Foundation
2-
import Combine
2+
3+
#if canImport(WordPressAPIInternal)
34
@preconcurrency import WordPressAPIInternal
5+
#endif
46

57
public final class PostTypeRequestPerformer {
68
typealias ExecutorType = PostTypesRequestExecutor

native/swift/Sources/wordpress-api/Protocols/Conformances/Posts.swift

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Foundation
2-
import Combine
2+
3+
#if canImport(WordPressAPIInternal)
34
@preconcurrency import WordPressAPIInternal
5+
#endif
46

57
public final class PostsRequestPerformer {
68
typealias ExecutorType = PostsRequestExecutor
@@ -93,9 +95,13 @@ extension PostsRequestPerformer: RequestPerformer, NoDeletionParams {
9395

9496
extension PostsRequestPerformer: CallbackAwarePerformer {}
9597
extension PostsRequestPerformer: PaginationAwarePerformer {}
96-
extension PostsRequestPerformer: PublisherAwarePerformer {}
9798
extension PostsRequestPerformer: SequenceAwarePerformer {}
9899

100+
#if canImport(Combine)
101+
import Combine
102+
extension PostsRequestPerformer: PublisherAwarePerformer {}
103+
#endif
104+
99105
// MARK: - PostsRequestExecutorProtocol
100106

101107
// Allows the performer to respond to everything the PostsRequestExecutor does

native/swift/Sources/wordpress-api/Protocols/Conformances/Users.swift

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Foundation
2-
import Combine
2+
3+
#if canImport(WordPressAPIInternal)
34
@preconcurrency import WordPressAPIInternal
5+
#endif
46

57
public final class UsersRequestPerformer {
68
typealias ExecutorType = UsersRequestExecutor
@@ -17,8 +19,14 @@ public final class UsersRequestPerformer {
1719
}
1820
}
1921

20-
extension UsersRequestPerformer: PublisherAwarePerformer {}
2122
extension UsersRequestPerformer: CallbackAwarePerformer {}
23+
extension UsersRequestPerformer: PaginationAwarePerformer {}
24+
extension UsersRequestPerformer: SequenceAwarePerformer {}
25+
26+
#if canImport(Combine)
27+
import Combine
28+
extension UsersRequestPerformer: PublisherAwarePerformer {}
29+
#endif
2230

2331
extension UsersRequestPerformer: RequestPerformer, HasDeletionParams {
2432
public typealias IdType = UserId

native/swift/Sources/wordpress-api/Protocols/PublisherAwarePerformer.swift

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Foundation
2+
#if canImport(Combine)
23
import Combine
34

45
public protocol PublisherAwarePerformer: RequestPerformer {
@@ -121,3 +122,4 @@ extension PublisherAwarePerformer where Self: HasDeletionParams {
121122
}.eraseToAnyPublisher()
122123
}
123124
}
125+
#endif

native/swift/Sources/wordpress-api/Protocols/SequenceAwarePerformer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22

3-
protocol SequenceAwarePerformer: RequestPerformer {
3+
public protocol SequenceAwarePerformer: RequestPerformer {
44
// MARK: - Pagination
55
func sequenceWithEditContext(
66
params: ListWithEditContextResponseType.ParamsType

native/swift/Sources/wordpress-api/WordPressAPI.swift

+6-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ public struct WordPressAPI {
4545
)
4646
}
4747

48-
public var users: UsersRequestExecutor {
49-
self.internalClient.users()
48+
public var users: UsersRequestPerformer {
49+
UsersRequestPerformer(
50+
executor: self.internalClient.users(),
51+
builder: self.requestBuilder.users(),
52+
session: self.urlSession
53+
)
5054
}
5155

5256
public var plugins: PluginsRequestExecutor {

0 commit comments

Comments
 (0)