diff --git a/Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift b/Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift index 550bffa8ad3b..926a7aee17a8 100644 --- a/Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift +++ b/Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift @@ -47,7 +47,7 @@ class MockWordPressComRestApi: WordPressComRestApi { override func perform( _ method: HTTPRequestBuilder.Method, URLString: String, - parameters: [String: AnyObject]? = nil, + parameters: [String: Any]? = nil, fulfilling progress: Progress? = nil, jsonDecoder: JSONDecoder? = nil, type: T.Type = T.self @@ -70,7 +70,7 @@ class MockWordPressComRestApi: WordPressComRestApi { override func perform( _ method: HTTPRequestBuilder.Method, URLString: String, - parameters: [String: AnyObject]? = nil, + parameters: [String: Any]? = nil, fulfilling progress: Progress? = nil ) async -> WordPressComRestApi.APIResult { switch method { diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index ba345d4b067d..3e8cc74e9ca5 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "49004416c56353c89015a6a59fdf567724f1b9bc66e98dc7c462aa05f0d6adc0", + "originHash" : "0ed52b944e605856a7ca56314dcbfee8c4c681a2a599fd3ef8d32d3c7ba95616", "pins" : [ { "identity" : "alamofire", @@ -393,7 +393,7 @@ "location" : "https://github.com/wordpress-mobile/WordPressKit-iOS", "state" : { "branch" : "wpios-edition", - "revision" : "94cbe7ed4ec184f104cc8e3c4c525c26e639c932" + "revision" : "5bc08764d2025e21685816065f611e884c8672d1" } }, { diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift index 93873eab7f4a..78287c2cf114 100644 --- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift +++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift @@ -24,6 +24,7 @@ public enum FeatureFlag: Int, CaseIterable { case readerGutenbergCommentComposer case pluginManagementOverhaul case nativeJetpackConnection + case newsletterSubscribers /// Returns a boolean indicating if the feature is enabled. /// @@ -78,6 +79,8 @@ public enum FeatureFlag: Int, CaseIterable { return false case .nativeJetpackConnection: return BuildConfiguration.current == .debug + case .newsletterSubscribers: + return BuildConfiguration.current == .debug } } @@ -120,6 +123,7 @@ extension FeatureFlag { case .pluginManagementOverhaul: "Plugin Management Overhaul" case .readerGutenbergCommentComposer: "Gutenberg Comment Composer" case .nativeJetpackConnection: "Native Jetpack Connection" + case .newsletterSubscribers: "Newsletter Subscribers" } } } diff --git a/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift b/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift index 582792cb3556..71948cde646f 100644 --- a/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift +++ b/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift @@ -2,6 +2,7 @@ import WordPressAuthenticator import UIKit import SwiftUI import WordPressUI +import WordPressKit import GutenbergKit import Combine