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

Commit 8193c2a

Browse files
committed
Convert ServiceRemoteWordPressComRESTApiVersion to modern ObjC enum
This should help with isolating the value so that we can further extract the path logic in the Swift implementation.
1 parent cf948e4 commit 8193c2a

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
@class WordPressComRestApi;
55

6-
typedef NSInteger NS_TYPED_ENUM ServiceRemoteWordPressComRESTApiVersion;
7-
extern ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_0;
8-
extern ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_1;
9-
extern ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_2;
10-
extern ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_3;
11-
extern ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_2_0;
6+
typedef NS_ENUM(NSInteger, ServiceRemoteWordPressComRESTApiVersion) {
7+
ServiceRemoteWordPressComRESTApiVersion_1_0 = 1000,
8+
ServiceRemoteWordPressComRESTApiVersion_1_1 = 1001,
9+
ServiceRemoteWordPressComRESTApiVersion_1_2 = 1002,
10+
ServiceRemoteWordPressComRESTApiVersion_1_3 = 1003,
11+
ServiceRemoteWordPressComRESTApiVersion_2_0 = 2000
12+
};
1213

1314
NS_ASSUME_NONNULL_BEGIN
1415

@@ -50,7 +51,8 @@ NS_ASSUME_NONNULL_BEGIN
5051
* @returns The request URL.
5152
*/
5253
- (NSString *)pathForEndpoint:(NSString *)endpoint
53-
withVersion:(ServiceRemoteWordPressComRESTApiVersion)apiVersion;
54+
withVersion:(ServiceRemoteWordPressComRESTApiVersion)apiVersion
55+
NS_SWIFT_NAME(path(forEndpoint:withVersion:));
5456

5557
@end
5658

Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
#import "ServiceRemoteWordPressComREST.h"
22
#import "WPKit-Swift.h"
33

4-
ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_0 = 1000;
5-
ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_1 = 1001;
6-
ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_2 = 1002;
7-
ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_1_3 = 1003;
8-
ServiceRemoteWordPressComRESTApiVersion const ServiceRemoteWordPressComRESTApiVersion_2_0 = 2000;
9-
104
static NSString* const ServiceRemoteWordPressComRESTApiVersionStringInvalid = @"invalid_api_version";
115
static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_0 = @"rest/v1";
126
static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_1 = @"rest/v1.1";

0 commit comments

Comments
 (0)