From e8c58ee8f36ade62c8c04fde7d27f73ad8ec541e Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 8 Dec 2022 21:00:30 +1300 Subject: [PATCH] Re-implement RemoteMenu, RemoteMenuItem, and RemoteMenuLocation --- WordPressKit.xcodeproj/project.pbxproj | 36 +++++++-------------- WordPressKit/MenusServiceRemote.m | 3 -- WordPressKit/RemoteMenu.h | 14 -------- WordPressKit/RemoteMenu.m | 5 --- WordPressKit/RemoteMenu.swift | 11 +++++++ WordPressKit/RemoteMenuItem.h | 20 ------------ WordPressKit/RemoteMenuItem.m | 5 --- WordPressKit/RemoteMenuItem.swift | 19 +++++++++++ WordPressKit/RemoteMenuLocation.h | 9 ------ WordPressKit/RemoteMenuLocation.m | 5 --- WordPressKit/RemoteMenuLocation.swift | 9 ++++++ WordPressKit/WordPressKit.h | 3 -- WordPressKitTests/MenusServiceRemoteTests.m | 1 - 13 files changed, 51 insertions(+), 89 deletions(-) delete mode 100644 WordPressKit/RemoteMenu.h delete mode 100644 WordPressKit/RemoteMenu.m create mode 100644 WordPressKit/RemoteMenu.swift delete mode 100644 WordPressKit/RemoteMenuItem.h delete mode 100644 WordPressKit/RemoteMenuItem.m create mode 100644 WordPressKit/RemoteMenuItem.swift delete mode 100644 WordPressKit/RemoteMenuLocation.h delete mode 100644 WordPressKit/RemoteMenuLocation.m create mode 100644 WordPressKit/RemoteMenuLocation.swift diff --git a/WordPressKit.xcodeproj/project.pbxproj b/WordPressKit.xcodeproj/project.pbxproj index 819300f3..8e8de65f 100644 --- a/WordPressKit.xcodeproj/project.pbxproj +++ b/WordPressKit.xcodeproj/project.pbxproj @@ -124,6 +124,9 @@ 46ABD0EA262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46ABD0E9262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift */; }; 4A1DEF44293051BC00322608 /* LoggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DEF43293051BC00322608 /* LoggingTests.swift */; }; 4A1DEF46293051C600322608 /* LoggingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DEF45293051C600322608 /* LoggingTests.m */; }; + 4A68E3D329406AA0004AC3DC /* RemoteMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */; }; + 4A68E3D429406AA0004AC3DC /* RemoteMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */; }; + 4A68E3D529406AA0004AC3DC /* RemoteMenuLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */; }; 57BCD3D426209D9500292CB3 /* AppTransportSecuritySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */; }; 730E869F21E44EFD00753E1A /* WordPressComServiceRemote+SiteVerticals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 730E869E21E44EFD00753E1A /* WordPressComServiceRemote+SiteVerticals.swift */; }; 731BA83621DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731BA83521DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift */; }; @@ -187,12 +190,6 @@ 74155E251EF87DDF00A06AEA /* ServiceRemoteRESTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */; }; 742362D61F10250600BD0A7F /* MenusServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362D41F10250600BD0A7F /* MenusServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; }; 742362D71F10250600BD0A7F /* MenusServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362D51F10250600BD0A7F /* MenusServiceRemote.m */; }; - 742362DE1F1025B400BD0A7F /* RemoteMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362D81F1025B400BD0A7F /* RemoteMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 742362DF1F1025B400BD0A7F /* RemoteMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362D91F1025B400BD0A7F /* RemoteMenu.m */; }; - 742362E01F1025B400BD0A7F /* RemoteMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 742362E11F1025B400BD0A7F /* RemoteMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */; }; - 742362E21F1025B400BD0A7F /* RemoteMenuLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 742362E31F1025B400BD0A7F /* RemoteMenuLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */; }; 7430C9A31F1927180051B8E6 /* ReaderPostServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 7430C99D1F1927180051B8E6 /* ReaderPostServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7430C9A41F1927180051B8E6 /* ReaderPostServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 7430C99E1F1927180051B8E6 /* ReaderPostServiceRemote.m */; }; 7430C9A51F1927180051B8E6 /* ReaderSiteServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 7430C99F1F1927180051B8E6 /* ReaderSiteServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -786,6 +783,9 @@ 46ABD0E9262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettingsTests.swift; sourceTree = ""; }; 4A1DEF43293051BC00322608 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = ""; }; 4A1DEF45293051C600322608 /* LoggingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoggingTests.m; sourceTree = ""; }; + 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenu.swift; sourceTree = ""; }; + 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuItem.swift; sourceTree = ""; }; + 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuLocation.swift; sourceTree = ""; }; 57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettings.swift; sourceTree = ""; }; 6C2A33D76FD1052D6F30466D /* Pods-WordPressKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKit/Pods-WordPressKit.debug.xcconfig"; sourceTree = ""; }; 6F2E0CC4FA01B5475A378DA2 /* Pods-WordPressKitTests.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKitTests.release-alpha.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKitTests/Pods-WordPressKitTests.release-alpha.xcconfig"; sourceTree = ""; }; @@ -851,12 +851,6 @@ 74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServiceRemoteRESTTests.m; sourceTree = ""; }; 742362D41F10250600BD0A7F /* MenusServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenusServiceRemote.h; sourceTree = ""; }; 742362D51F10250600BD0A7F /* MenusServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenusServiceRemote.m; sourceTree = ""; }; - 742362D81F1025B400BD0A7F /* RemoteMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenu.h; sourceTree = ""; }; - 742362D91F1025B400BD0A7F /* RemoteMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenu.m; sourceTree = ""; }; - 742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuItem.h; sourceTree = ""; }; - 742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuItem.m; sourceTree = ""; }; - 742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuLocation.h; sourceTree = ""; }; - 742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuLocation.m; sourceTree = ""; }; 7430C99D1F1927180051B8E6 /* ReaderPostServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderPostServiceRemote.h; sourceTree = ""; }; 7430C99E1F1927180051B8E6 /* ReaderPostServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderPostServiceRemote.m; sourceTree = ""; }; 7430C99F1F1927180051B8E6 /* ReaderSiteServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSiteServiceRemote.h; sourceTree = ""; }; @@ -1946,12 +1940,9 @@ E6B0460825E5B4DD00DF6F4F /* RemoteInviteLink.swift */, 74DA56381F06EB3000FE9BF4 /* RemoteMedia.h */, 74DA56391F06EB3000FE9BF4 /* RemoteMedia.m */, - 742362D81F1025B400BD0A7F /* RemoteMenu.h */, - 742362D91F1025B400BD0A7F /* RemoteMenu.m */, - 742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */, - 742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */, - 742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */, - 742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */, + 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */, + 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */, + 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */, 74A44DCE1F13C64B006CD8F4 /* RemoteNotification.swift */, 74A44DCF1F13C64B006CD8F4 /* RemoteNotificationSettings.swift */, 74D67F071F15BEB70010C5ED /* RemotePerson.swift */, @@ -2553,8 +2544,6 @@ 74BA04F91F06DC3900ED5CD8 /* RemoteComment.h in Headers */, 74BA04F21F06DC0A00ED5CD8 /* CommentServiceRemote.h in Headers */, 74BA04F51F06DC0A00ED5CD8 /* CommentServiceRemoteXMLRPC.h in Headers */, - 742362DE1F1025B400BD0A7F /* RemoteMenu.h in Headers */, - 742362E01F1025B400BD0A7F /* RemoteMenuItem.h in Headers */, 7430C9B51F1927C50051B8E6 /* RemoteReaderSiteInfo.h in Headers */, 7430C9A71F1927180051B8E6 /* ReaderTopicServiceRemote.h in Headers */, 7430C9B71F1927C50051B8E6 /* RemoteReaderTopic.h in Headers */, @@ -2563,7 +2552,6 @@ 7430C9A51F1927180051B8E6 /* ReaderSiteServiceRemote.h in Headers */, 7430C9A31F1927180051B8E6 /* ReaderPostServiceRemote.h in Headers */, 742362D61F10250600BD0A7F /* MenusServiceRemote.h in Headers */, - 742362E21F1025B400BD0A7F /* RemoteMenuLocation.h in Headers */, 740B23BA1F17EC7300067A2A /* PostServiceRemoteXMLRPC.h in Headers */, 740B23BD1F17ECB500067A2A /* PostServiceRemoteOptions.h in Headers */, 740B23B71F17EC7300067A2A /* PostServiceRemote.h in Headers */, @@ -3068,6 +3056,7 @@ 803DE80F28FFA787007D4E9C /* RemoteConfigRemote.swift in Sources */, F9E56DF624EB11EF00916770 /* FeatureFlag.swift in Sources */, 8B2F4BE724ABC8A90056C08A /* ReaderPostServiceRemote+Cards.swift in Sources */, + 4A68E3D529406AA0004AC3DC /* RemoteMenuLocation.swift in Sources */, 8B16CE8E25250039007BE5A9 /* RemoteReaderPost.swift in Sources */, 74E2294E1F1E73FE0085F7F2 /* RemotePublicizeService.swift in Sources */, 8B749DED25AF3E4600023F03 /* JetpackCapabilitiesServiceRemote.swift in Sources */, @@ -3078,7 +3067,6 @@ 40819773221E10C900A298E4 /* StatsPublishedPostsTimeIntervalData.swift in Sources */, 4625B96C253A357500C04AAD /* PageLayoutServiceRemote.swift in Sources */, E6B0460925E5B4DD00DF6F4F /* RemoteInviteLink.swift in Sources */, - 742362E11F1025B400BD0A7F /* RemoteMenuItem.m in Sources */, 436D56332118D7AA00CEAA33 /* TransactionsServiceRemote.swift in Sources */, 93BD27721EE737A9002BB00B /* ServiceRemoteWordPressXMLRPC.m in Sources */, C76F456825B9F30E00BFEC87 /* JetpackScanHistory.swift in Sources */, @@ -3160,12 +3148,13 @@ 7328420421CD786C00126755 /* WordPressComServiceRemote+SiteCreation.swift in Sources */, 32FC1D28255C91ED00CD0A7B /* JetpackScan.swift in Sources */, 826016F31F9FA17B00533B6C /* Activity.swift in Sources */, + 4A68E3D329406AA0004AC3DC /* RemoteMenu.swift in Sources */, 40819783221F5C8200A298E4 /* StatsPostDetails.swift in Sources */, 7397F01A220A072500C723F3 /* ActivityServiceRemote_ApiVersion1_0.swift in Sources */, + 4A68E3D429406AA0004AC3DC /* RemoteMenuItem.swift in Sources */, 8B2F4BEF24ACCC120056C08A /* RemoteReaderCard.swift in Sources */, 40E7FEB1220FB3B60032834E /* StatsAnnualAndMostPopularTimeInsight.swift in Sources */, 3F758FD324F6C68200BBA2FC /* AnnouncementServiceRemote.swift in Sources */, - 742362E31F1025B400BD0A7F /* RemoteMenuLocation.m in Sources */, FAB4F32324EC072700F259BA /* ReaderPostServiceRemote+Subscriptions.swift in Sources */, 82FFBF561F460DD400F4573F /* BlogJetpackSettingsServiceRemote.swift in Sources */, 3297E15625645C7D00287D21 /* JetpackCredentials.swift in Sources */, @@ -3221,7 +3210,6 @@ FEE4EF57272FDD4B003CDA3C /* RemoteCommentV2.swift in Sources */, 7430C9B21F1927C50051B8E6 /* RemoteReaderPost.m in Sources */, 74A44DCD1F13C533006CD8F4 /* PushAuthenticationServiceRemote.swift in Sources */, - 742362DF1F1025B400BD0A7F /* RemoteMenu.m in Sources */, 74B5F0D81EF8299B00B411E7 /* BlogServiceRemoteREST.m in Sources */, 9FCDD09720A5EF75004F0BF7 /* ReaderTopicServiceError.swift in Sources */, 74A44DD11F13C64B006CD8F4 /* RemoteNotificationSettings.swift in Sources */, diff --git a/WordPressKit/MenusServiceRemote.m b/WordPressKit/MenusServiceRemote.m index 44c6e285..0c224506 100644 --- a/WordPressKit/MenusServiceRemote.m +++ b/WordPressKit/MenusServiceRemote.m @@ -1,7 +1,4 @@ #import "MenusServiceRemote.h" -#import "RemoteMenu.h" -#import "RemoteMenuItem.h" -#import "RemoteMenuLocation.h" #import "WPKit-Swift.h" @import WordPressShared; @import NSObject_SafeExpectations; diff --git a/WordPressKit/RemoteMenu.h b/WordPressKit/RemoteMenu.h deleted file mode 100644 index 6b02ecd0..00000000 --- a/WordPressKit/RemoteMenu.h +++ /dev/null @@ -1,14 +0,0 @@ -#import - -@class RemoteMenuItem; -@class RemoteMenuLocation; - -@interface RemoteMenu : NSObject - -@property (nullable, nonatomic, copy) NSNumber *menuID; -@property (nullable, nonatomic, copy) NSString *details; -@property (nullable, nonatomic, copy) NSString *name; -@property (nullable, nonatomic, strong) NSArray *items; -@property (nullable, nonatomic, strong) NSArray *locationNames; - -@end diff --git a/WordPressKit/RemoteMenu.m b/WordPressKit/RemoteMenu.m deleted file mode 100644 index 21c3a2fa..00000000 --- a/WordPressKit/RemoteMenu.m +++ /dev/null @@ -1,5 +0,0 @@ -#import "RemoteMenu.h" - -@implementation RemoteMenu - -@end diff --git a/WordPressKit/RemoteMenu.swift b/WordPressKit/RemoteMenu.swift new file mode 100644 index 00000000..203533e9 --- /dev/null +++ b/WordPressKit/RemoteMenu.swift @@ -0,0 +1,11 @@ +import Foundation + +@objcMembers public class RemoteMenu: NSObject { + + public var menuID: NSNumber? + public var details: String? + public var name: String? + public var items: [RemoteMenuItem]? + public var locationNames: [String]? + +} diff --git a/WordPressKit/RemoteMenuItem.h b/WordPressKit/RemoteMenuItem.h deleted file mode 100644 index ad16b81a..00000000 --- a/WordPressKit/RemoteMenuItem.h +++ /dev/null @@ -1,20 +0,0 @@ -#import - -@interface RemoteMenuItem : NSObject - -@property (nullable, nonatomic, copy) NSNumber *itemID; -@property (nullable, nonatomic, copy) NSNumber *contentID; -@property (nullable, nonatomic, copy) NSString *details; -@property (nullable, nonatomic, copy) NSString *linkTarget; -@property (nullable, nonatomic, copy) NSString *linkTitle; -@property (nullable, nonatomic, copy) NSString *name; -@property (nullable, nonatomic, copy) NSString *type; -@property (nullable, nonatomic, copy) NSString *typeFamily; -@property (nullable, nonatomic, copy) NSString *typeLabel; -@property (nullable, nonatomic, copy) NSString *urlStr; -@property (nullable, nonatomic, copy) NSArray *classes; - -@property (nullable, nonatomic, strong) NSArray *children; -@property (nullable, nonatomic, weak) RemoteMenuItem *parentItem; - -@end diff --git a/WordPressKit/RemoteMenuItem.m b/WordPressKit/RemoteMenuItem.m deleted file mode 100644 index 5860ebd7..00000000 --- a/WordPressKit/RemoteMenuItem.m +++ /dev/null @@ -1,5 +0,0 @@ -#import "RemoteMenuItem.h" - -@implementation RemoteMenuItem - -@end diff --git a/WordPressKit/RemoteMenuItem.swift b/WordPressKit/RemoteMenuItem.swift new file mode 100644 index 00000000..99abc029 --- /dev/null +++ b/WordPressKit/RemoteMenuItem.swift @@ -0,0 +1,19 @@ +import Foundation + +@objcMembers public class RemoteMenuItem: NSObject { + + public var itemID: NSNumber? + public var contentID: NSNumber? + public var details: String? + public var linkTarget: String? + public var linkTitle: String? + public var name: String? + public var type: String? + public var typeFamily: String? + public var typeLabel: String? + public var urlStr: String? + public var classes: [String]? + public var children: [RemoteMenuItem]? + public weak var parentItem: RemoteMenuItem? + +} diff --git a/WordPressKit/RemoteMenuLocation.h b/WordPressKit/RemoteMenuLocation.h deleted file mode 100644 index 423f0900..00000000 --- a/WordPressKit/RemoteMenuLocation.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - -@interface RemoteMenuLocation : NSObject - -@property (nullable, nonatomic, copy) NSString *name; -@property (nullable, nonatomic, copy) NSString *defaultState; -@property (nullable, nonatomic, copy) NSString *details; - -@end diff --git a/WordPressKit/RemoteMenuLocation.m b/WordPressKit/RemoteMenuLocation.m deleted file mode 100644 index 9d40b626..00000000 --- a/WordPressKit/RemoteMenuLocation.m +++ /dev/null @@ -1,5 +0,0 @@ -#import "RemoteMenuLocation.h" - -@implementation RemoteMenuLocation - -@end diff --git a/WordPressKit/RemoteMenuLocation.swift b/WordPressKit/RemoteMenuLocation.swift new file mode 100644 index 00000000..f0d29780 --- /dev/null +++ b/WordPressKit/RemoteMenuLocation.swift @@ -0,0 +1,9 @@ +import Foundation + +@objcMembers public class RemoteMenuLocation: NSObject { + + public var name: String? + public var defaultState: String? + public var details: String? + +} diff --git a/WordPressKit/WordPressKit.h b/WordPressKit/WordPressKit.h index f65dd7c2..7144736c 100644 --- a/WordPressKit/WordPressKit.h +++ b/WordPressKit/WordPressKit.h @@ -39,9 +39,6 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[]; #import #import #import -#import -#import -#import #import #import #import diff --git a/WordPressKitTests/MenusServiceRemoteTests.m b/WordPressKitTests/MenusServiceRemoteTests.m index 66fd99f2..52f7467a 100644 --- a/WordPressKitTests/MenusServiceRemoteTests.m +++ b/WordPressKitTests/MenusServiceRemoteTests.m @@ -1,7 +1,6 @@ #import #import #import "MenusServiceRemote.h" -#import "RemoteMenu.h" #import "WPKit-Swift.h" @interface MenusServicRemoteTests : XCTestCase