From 9ed3e33ad9fc897ed2b47f8edbf6aae9b8922c46 Mon Sep 17 00:00:00 2001
From: kean <grebenyuk.alexander@gmail.com>
Date: Wed, 26 Jun 2024 17:26:47 -0400
Subject: [PATCH] Add SPM support to WPKit

---
 .../WordPressComRESTAPIVersionedPathBuilder.m      |  5 -----
 .../include/WordPressComRESTAPIVersion.h           |  8 ++++++++
 .../WordPressComRESTAPIVersionedPathBuilder.h      | 14 --------------
 WordPressKit/Sources/WordPressKit/WordPressKit.h   |  1 -
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h

diff --git a/WordPressKit/Sources/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m b/WordPressKit/Sources/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m
index 073dcc0e0bb6..79b5116426be 100644
--- a/WordPressKit/Sources/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m
+++ b/WordPressKit/Sources/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m
@@ -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";
diff --git a/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersion.h b/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersion.h
index 9625473ee97a..2057f9d6f714 100644
--- a/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersion.h
+++ b/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersion.h
@@ -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
diff --git a/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h b/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h
deleted file mode 100644
index d9f8b8162826..000000000000
--- a/WordPressKit/Sources/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-#if SWIFT_PACKAGE
-#import "WordPressComRESTAPIVersion.h"
-#else
-#import <WordPressKit/WordPressComRESTAPIVersion.h>
-#endif
-
-@interface WordPressComRESTAPIVersionedPathBuilder: NSObject
-
-+ (NSString *)pathForEndpoint:(NSString *)endpoint
-                  withVersion:(WordPressComRESTAPIVersion)apiVersion
-NS_SWIFT_NAME(path(forEndpoint:withVersion:));
-
-@end
diff --git a/WordPressKit/Sources/WordPressKit/WordPressKit.h b/WordPressKit/Sources/WordPressKit/WordPressKit.h
index 482fdb30e7c0..ac93bcecae94 100644
--- a/WordPressKit/Sources/WordPressKit/WordPressKit.h
+++ b/WordPressKit/Sources/WordPressKit/WordPressKit.h
@@ -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>