Skip to content

Update access for some methods soon to be in WordPressData #24403

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

Merged
mokagio merged 4 commits into from
Apr 3, 2025
Merged

Update access for some methods soon to be in WordPressData #24403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9578e91
Update access level for some methods that will soon be in WordPressData
mokagio Apr 3, 2025
6163ea7
Remove an unused forward declaration from `Blog.h`
mokagio Apr 3, 2025
d868f93
Remove unused `AccountService` import from `Blog.m`
mokagio Apr 3, 2025
4bccc20
Merge branch 'trunk' into mokagio/wordpressdata-precursor-retndorsitendo
kean Apr 3, 2025
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
6 changes: 3 additions & 3 deletions WordPress/Classes/Models/Blog/Blog+SelfHosted.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import CryptoKit
import WordPressAPI
import WordPressShared

extension Blog {
public extension Blog {

enum BlogCredentialsError: Error {
case blogUrlMissing
Expand Down Expand Up @@ -64,7 +64,7 @@ extension Blog {

@available(swift, obsoleted: 1.0)
@objc(deleteApplicationToken)
public func objc_deleteApplicationToken() {
func objc_deleteApplicationToken() {
_ = try? deleteApplicationToken()
}

Expand Down Expand Up @@ -159,7 +159,7 @@ extension Blog {
}
}

extension WpApiApplicationPasswordDetails {
public extension WpApiApplicationPasswordDetails {
var derivedXMLRPCRoot: URL {
get throws {
let url = try ParsedUrl.parse(input: siteUrl).asURL()
Expand Down
1 change: 0 additions & 1 deletion WordPress/Classes/Models/Blog/Blog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
@class UserSuggestion;
@class SiteSuggestion;
@class PageTemplateCategory;
@class JetpackFeaturesRemovalCoordinator;
@class PublicizeInfo;

extern NSString * const BlogEntityName;
Expand Down
5 changes: 2 additions & 3 deletions WordPress/Classes/Models/Blog/Blog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#import "Blog.h"
#import "WPAccount.h"
#import "AccountService.h"

@kean kean Apr 3, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice removals.

@import WordPressShared;
#ifdef KEYSTONE
#import "Keystone-Swift.h"
#else
#import "WordPress-Swift.h"
#endif
@import SFHFKeychainUtils;

@import SFHFKeychainUtils;
@import WordPressShared;
@import NSObject_SafeExpectations;
@import NSURL_IDN;

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/Media.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import UniformTypeIdentifiers

extension Media {
public extension Media {
// MARK: - AutoUpload Failure Count

static let maxAutoUploadFailureCount = 3
Expand Down
10 changes: 5 additions & 5 deletions WordPress/Classes/Models/Site Creation/SiteInformation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
struct SiteInformation {
let title: String
let tagLine: String?
public struct SiteInformation {
public let title: String
public let tagLine: String?

/// if title is nil, then the corresponding SiteInformation value is nil
init?(title: String?, tagLine: String?) {
public init?(title: String?, tagLine: String?) {
guard let title else {
return nil
}
Expand All @@ -13,7 +13,7 @@ struct SiteInformation {
}

extension SiteInformation: Equatable {
static func ==(lhs: SiteInformation, rhs: SiteInformation) -> Bool {
public static func ==(lhs: SiteInformation, rhs: SiteInformation) -> Bool {
return lhs.title == rhs.title &&
lhs.tagLine == rhs.tagLine
}
Expand Down