Skip to content

Fix the SPM issue with ObjC headers in WPKit #23390

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.

Sign up for GitHub

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

Closed
kean wants to merge 1 commit into from
Closed

Fix the SPM issue with ObjC headers in WPKit #23390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions WordPressKit/Sources/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#import <Foundation/Foundation.h>
#if SWIFT_PACKAGE
#import "WordPressComRESTAPIVersionedPathBuilder.h"
#import "WordPressComRESTAPIVersion.h"
#else
#import "WordPressKit/WordPressComRESTAPIVersionedPathBuilder.h"
#endif

static NSString* const WordPressComRESTApiVersionStringInvalid = @"invalid_api_version";
static NSString* const WordPressComRESTApiVersionString_1_0 = @"rest/v1";
Expand Down
8 changes: 8 additions & 0 deletions WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@ typedef NS_ENUM(NSInteger, WordPressComRESTAPIVersion) {
WordPressComRESTAPIVersion_1_3 = 1003,
WordPressComRESTAPIVersion_2_0 = 2000
};

@interface WordPressComRESTAPIVersionedPathBuilder: NSObject

+ (NSString *)pathForEndpoint:(NSString *)endpoint
withVersion:(WordPressComRESTAPIVersion)apiVersion
NS_SWIFT_NAME(path(forEndpoint:withVersion:));

@end
14 changes: 0 additions & 14 deletions WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion WordPressKit/Sources/WordPressKit/WordPressKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[];
#import <WordPressKit/FilePart.h>
#import <WordPressKit/WordPressComRESTAPIInterfacing.h>
#import <WordPressKit/WordPressComRESTAPIVersion.h>
#import <WordPressKit/WordPressComRESTAPIVersionedPathBuilder.h>
#import <WordPressKit/WordPressComRestApiErrorDomain.h>

#import <WordPressKit/ServiceRemoteWordPressComREST.h>
Expand Down