Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 277f0ca

Browse files
mokagiomokagio
committed
Move WordPressOrgXMLRPCApiErrorDomain definition to APIInterface
1 parent eeb26d8 commit 277f0ca

File tree

7 files changed

+19
-34
lines changed

7 files changed

+19
-34
lines changed

‎Sources/APIInterface/include/WordPressOrgXMLRPCApiErrorDomain.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#import <Foundation/Foundation.h>
2+
3+
/// Error domain of `NSError` instances that are converted from `WordPressOrgXMLRPCApiError`
4+
/// and `WordPressAPIError<WordPressOrgXMLRPCApiError>` instances.
5+
///
6+
/// This matches the compiler generated value and is used to ensure consistent error domain across error types and SPM or Framework build modes.
7+
///
8+
/// See `extension WordPressComRestApiEndpointError: CustomNSError` in CoreAPI package for context.
9+
static NSString *const _Nonnull WordPressOrgXMLRPCApiErrorDomain = @"WordPressKit.WordPressOrgXMLRPCApiError";

‎Sources/CoreAPI/WordPressOrgXMLRPCApiError+NSErrorBridge.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import Foundation
2+
#if SWIFT_PACKAGE
3+
import APIInterface
4+
#endif
25

36
/// See `extension WordPressComRestApiEndpointError: CustomNSError` for documentation and rationale.
47
extension WordPressOrgXMLRPCApiError: CustomNSError {

‎Sources/CoreAPI/WordPressOrgXMLRPCApiErrorDomain.swift‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Sources/WordPressKit/WordPressKit.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[];
1111
#import <WordPressKit/WordPressComRESTAPIVersion.h>
1212
#import <WordPressKit/WordPressComRESTAPIVersionedPathBuilder.h>
1313
#import <WordPressKit/WordPressComRestApiErrorDomain.h>
14+
#import <WordPressKit/WordPressOrgXMLRPCApiErrorDomain.h>
1415

1516
#import <WordPressKit/ServiceRemoteWordPressComREST.h>
1617
#import <WordPressKit/ServiceRemoteWordPressXMLRPC.h>

‎Tests/CoreAPITests/WordPressOrgXMLRPCApiErrorTests.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#if SWIFT_PACKAGE
2+
import APIInterface
23
@testable import CoreAPI
34
#else
45
@testable import WordPressKit

‎Tests/CoreAPITests/WordPressOrgXMLRPCApiTests.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import XCTest
22
import OHHTTPStubs
33
import wpxmlrpc
44
#if SWIFT_PACKAGE
5+
import APIInterface
56
@testable import CoreAPI
67
import OHHTTPStubsSwift
78
#else

‎WordPressKit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
32FC20CE255DCC6100CD0A7B /* JetpackScanThreat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FC20CD255DCC6100CD0A7B /* JetpackScanThreat.swift */; };
6565
3F3195AD266FF94B00397EE7 /* ZendeskMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */; };
6666
3F3C9E9C289A3E31009A1357 /* TestCollector+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */; };
67-
3F6128112BCB310F0063810D /* WordPressOrgXMLRPCApiErrorDomain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6128102BCB310F0063810D /* WordPressOrgXMLRPCApiErrorDomain.swift */; };
6867
3F6128132BCB31660063810D /* WordPressOrgXMLRPCApiError+NSErrorBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6128122BCB31660063810D /* WordPressOrgXMLRPCApiError+NSErrorBridge.swift */; };
6968
3F6128162BCB320B0063810D /* WordPressOrgXMLRPCApiErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6128142BCB31DB0063810D /* WordPressOrgXMLRPCApiErrorTests.swift */; };
7069
3F758FD324F6C68200BBA2FC /* AnnouncementServiceRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F758FD224F6C68200BBA2FC /* AnnouncementServiceRemote.swift */; };
7170
3F8308A729EE683500354497 /* ActivityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F8308A629EE683500354497 /* ActivityTests.swift */; };
7271
3FA4258F2BCCFDA6007539BF /* WordPressComRestApiErrorDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FA4258E2BCCFDA6007539BF /* WordPressComRestApiErrorDomain.h */; settings = {ATTRIBUTES = (Public, ); }; };
72+
3FA425A72BCF7EDC007539BF /* WordPressOrgXMLRPCApiErrorDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FA425A62BCF7E7C007539BF /* WordPressOrgXMLRPCApiErrorDomain.h */; settings = {ATTRIBUTES = (Public, ); }; };
7373
3FB8642C2888089F003A86BE /* BuildkiteTestCollector in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB8642B2888089F003A86BE /* BuildkiteTestCollector */; };
7474
3FD634E52BC3A55F00CEDF5E /* WordPressOrgXMLRPCValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FD634E32BC3A55F00CEDF5E /* WordPressOrgXMLRPCValidator.swift */; };
7575
3FD634E62BC3A55F00CEDF5E /* Date+WordPressCom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FD634E42BC3A55F00CEDF5E /* Date+WordPressCom.swift */; };
@@ -815,12 +815,12 @@
815815
32FC20CD255DCC6100CD0A7B /* JetpackScanThreat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackScanThreat.swift; sourceTree = "<group>"; };
816816
3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZendeskMetadata.swift; sourceTree = "<group>"; };
817817
3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TestCollector+Constants.swift"; sourceTree = "<group>"; };
818-
3F6128102BCB310F0063810D /* WordPressOrgXMLRPCApiErrorDomain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressOrgXMLRPCApiErrorDomain.swift; sourceTree = "<group>"; };
819818
3F6128122BCB31660063810D /* WordPressOrgXMLRPCApiError+NSErrorBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WordPressOrgXMLRPCApiError+NSErrorBridge.swift"; sourceTree = "<group>"; };
820819
3F6128142BCB31DB0063810D /* WordPressOrgXMLRPCApiErrorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressOrgXMLRPCApiErrorTests.swift; sourceTree = "<group>"; };
821820
3F758FD224F6C68200BBA2FC /* AnnouncementServiceRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementServiceRemote.swift; sourceTree = "<group>"; };
822821
3F8308A629EE683500354497 /* ActivityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityTests.swift; sourceTree = "<group>"; };
823822
3FA4258E2BCCFDA6007539BF /* WordPressComRestApiErrorDomain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordPressComRestApiErrorDomain.h; sourceTree = "<group>"; };
823+
3FA425A62BCF7E7C007539BF /* WordPressOrgXMLRPCApiErrorDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WordPressOrgXMLRPCApiErrorDomain.h; sourceTree = "<group>"; };
824824
3FB8642D288813E9003A86BE /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = "<group>"; };
825825
3FD634E32BC3A55F00CEDF5E /* WordPressOrgXMLRPCValidator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressOrgXMLRPCValidator.swift; sourceTree = "<group>"; };
826826
3FD634E42BC3A55F00CEDF5E /* Date+WordPressCom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+WordPressCom.swift"; sourceTree = "<group>"; };
@@ -2102,6 +2102,7 @@
21022102
children = (
21032103
3FE2E94E2BB29A1B002CA2E1 /* FilePart.h */,
21042104
3FA4258E2BCCFDA6007539BF /* WordPressComRestApiErrorDomain.h */,
2105+
3FA425A62BCF7E7C007539BF /* WordPressOrgXMLRPCApiErrorDomain.h */,
21052106
3FFCC0552BABC78B0051D229 /* WordPressComRESTAPIInterfacing.h */,
21062107
3FE2E9662BBEB8D2002CA2E1 /* WordPressComRESTAPIVersion.h */,
21072108
3FD635032BC3F03200CEDF5E /* WordPressComRESTAPIVersionedPathBuilder.h */,
@@ -2142,7 +2143,6 @@
21422143
3FE2E97A2BC3A332002CA2E1 /* WordPressComRestApi.swift */,
21432144
4A05E7992B2FDC3200C25E3B /* WordPressOrgRestApi.swift */,
21442145
93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */,
2145-
3F6128102BCB310F0063810D /* WordPressOrgXMLRPCApiErrorDomain.swift */,
21462146
3F6128122BCB31660063810D /* WordPressOrgXMLRPCApiError+NSErrorBridge.swift */,
21472147
3FD634E32BC3A55F00CEDF5E /* WordPressOrgXMLRPCValidator.swift */,
21482148
93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */,
@@ -2725,6 +2725,7 @@
27252725
9311A6881F22625A00704AC9 /* TaxonomyServiceRemoteREST.h in Headers */,
27262726
93188D1E1F2262BF0028ED4D /* RemotePostTag.h in Headers */,
27272727
9311A6871F22625A00704AC9 /* TaxonomyServiceRemote.h in Headers */,
2728+
3FA425A72BCF7EDC007539BF /* WordPressOrgXMLRPCApiErrorDomain.h in Headers */,
27282729
9309994D1F1657C600F006A1 /* ThemeServiceRemote.h in Headers */,
27292730
B5969E1C20A49AC4005E9DF1 /* NSString+MD5.h in Headers */,
27302731
740B23C41F17EE8000067A2A /* RemotePost.h in Headers */,
@@ -3399,7 +3400,6 @@
33993400
740B23C31F17EE8000067A2A /* RemotePostCategory.m in Sources */,
34003401
8B2F4BF124ACE3C30056C08A /* RemoteReaderInterest.swift in Sources */,
34013402
74B5F0E71EF8699C00B411E7 /* RemotePostType.m in Sources */,
3402-
3F6128112BCB310F0063810D /* WordPressOrgXMLRPCApiErrorDomain.swift in Sources */,
34033403
93188D1F1F2262BF0028ED4D /* RemotePostTag.m in Sources */,
34043404
3FD634F72BC3AD6200CEDF5E /* WebauthChallengeInfo.swift in Sources */,
34053405
74D67F081F15BEB70010C5ED /* RemotePerson.swift in Sources */,

0 commit comments

Comments
 (0)