Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 12 additions & 24 deletions WordPressKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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, ); }; };
Expand Down Expand Up @@ -786,6 +783,9 @@
46ABD0E9262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettingsTests.swift; sourceTree = "<group>"; };
4A1DEF43293051BC00322608 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
4A1DEF45293051C600322608 /* LoggingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoggingTests.m; sourceTree = "<group>"; };
4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenu.swift; sourceTree = "<group>"; };
4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuItem.swift; sourceTree = "<group>"; };
4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuLocation.swift; sourceTree = "<group>"; };
57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettings.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
Expand Down Expand Up @@ -851,12 +851,6 @@
74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServiceRemoteRESTTests.m; sourceTree = "<group>"; };
742362D41F10250600BD0A7F /* MenusServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenusServiceRemote.h; sourceTree = "<group>"; };
742362D51F10250600BD0A7F /* MenusServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenusServiceRemote.m; sourceTree = "<group>"; };
742362D81F1025B400BD0A7F /* RemoteMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenu.h; sourceTree = "<group>"; };
742362D91F1025B400BD0A7F /* RemoteMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenu.m; sourceTree = "<group>"; };
742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuItem.h; sourceTree = "<group>"; };
742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuItem.m; sourceTree = "<group>"; };
742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuLocation.h; sourceTree = "<group>"; };
742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuLocation.m; sourceTree = "<group>"; };
7430C99D1F1927180051B8E6 /* ReaderPostServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderPostServiceRemote.h; sourceTree = "<group>"; };
7430C99E1F1927180051B8E6 /* ReaderPostServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderPostServiceRemote.m; sourceTree = "<group>"; };
7430C99F1F1927180051B8E6 /* ReaderSiteServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSiteServiceRemote.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down
3 changes: 0 additions & 3 deletions WordPressKit/MenusServiceRemote.m
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 0 additions & 14 deletions WordPressKit/RemoteMenu.h

This file was deleted.

5 changes: 0 additions & 5 deletions WordPressKit/RemoteMenu.m

This file was deleted.

11 changes: 11 additions & 0 deletions WordPressKit/RemoteMenu.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Foundation

@objcMembers public class RemoteMenu: NSObject {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL about @objcMembers, to make all members of a Swift type available to Objective-C. Neat.


public var menuID: NSNumber?
public var details: String?
public var name: String?
public var items: [RemoteMenuItem]?
public var locationNames: [String]?

}
20 changes: 0 additions & 20 deletions WordPressKit/RemoteMenuItem.h

This file was deleted.

5 changes: 0 additions & 5 deletions WordPressKit/RemoteMenuItem.m

This file was deleted.

19 changes: 19 additions & 0 deletions WordPressKit/RemoteMenuItem.swift
Original file line number Diff line number Diff line change
@@ -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?

}
9 changes: 0 additions & 9 deletions WordPressKit/RemoteMenuLocation.h

This file was deleted.

5 changes: 0 additions & 5 deletions WordPressKit/RemoteMenuLocation.m

This file was deleted.

9 changes: 9 additions & 0 deletions WordPressKit/RemoteMenuLocation.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Foundation

@objcMembers public class RemoteMenuLocation: NSObject {

public var name: String?
public var defaultState: String?
public var details: String?

}
3 changes: 0 additions & 3 deletions WordPressKit/WordPressKit.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[];
#import <WordPressKit/RemoteBlogOptionsHelper.h>
#import <WordPressKit/RemoteComment.h>
#import <WordPressKit/RemoteMedia.h>
#import <WordPressKit/RemoteMenu.h>
#import <WordPressKit/RemoteMenuItem.h>
#import <WordPressKit/RemoteMenuLocation.h>
#import <WordPressKit/RemotePost.h>
#import <WordPressKit/RemotePostCategory.h>
#import <WordPressKit/RemotePostTag.h>
Expand Down
1 change: 0 additions & 1 deletion WordPressKitTests/MenusServiceRemoteTests.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#import <OCMock/OCMock.h>
#import <XCTest/XCTest.h>
#import "MenusServiceRemote.h"
#import "RemoteMenu.h"
#import "WPKit-Swift.h"

@interface MenusServicRemoteTests : XCTestCase
Expand Down