Skip to content

Commit 096428c

Browse files
authored
Add Newsletter Subscribers FF and update WPKit (#24507)
* Add Newsletter Subscribers FF * Update WPKit * Update WPKit * Update tests
1 parent 3c85f36 commit 096428c

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class MockWordPressComRestApi: WordPressComRestApi {
4747
override func perform<T: Decodable>(
4848
_ method: HTTPRequestBuilder.Method,
4949
URLString: String,
50-
parameters: [String: AnyObject]? = nil,
50+
parameters: [String: Any]? = nil,
5151
fulfilling progress: Progress? = nil,
5252
jsonDecoder: JSONDecoder? = nil,
5353
type: T.Type = T.self
@@ -70,7 +70,7 @@ class MockWordPressComRestApi: WordPressComRestApi {
7070
override func perform(
7171
_ method: HTTPRequestBuilder.Method,
7272
URLString: String,
73-
parameters: [String: AnyObject]? = nil,
73+
parameters: [String: Any]? = nil,
7474
fulfilling progress: Progress? = nil
7575
) async -> WordPressComRestApi.APIResult<AnyObject> {
7676
switch method {

WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "49004416c56353c89015a6a59fdf567724f1b9bc66e98dc7c462aa05f0d6adc0",
2+
"originHash" : "0ed52b944e605856a7ca56314dcbfee8c4c681a2a599fd3ef8d32d3c7ba95616",
33
"pins" : [
44
{
55
"identity" : "alamofire",
@@ -393,7 +393,7 @@
393393
"location" : "https://github.com/wordpress-mobile/WordPressKit-iOS",
394394
"state" : {
395395
"branch" : "wpios-edition",
396-
"revision" : "94cbe7ed4ec184f104cc8e3c4c525c26e639c932"
396+
"revision" : "5bc08764d2025e21685816065f611e884c8672d1"
397397
}
398398
},
399399
{

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public enum FeatureFlag: Int, CaseIterable {
2424
case readerGutenbergCommentComposer
2525
case pluginManagementOverhaul
2626
case nativeJetpackConnection
27+
case newsletterSubscribers
2728

2829
/// Returns a boolean indicating if the feature is enabled.
2930
///
@@ -78,6 +79,8 @@ public enum FeatureFlag: Int, CaseIterable {
7879
return false
7980
case .nativeJetpackConnection:
8081
return BuildConfiguration.current == .debug
82+
case .newsletterSubscribers:
83+
return BuildConfiguration.current == .debug
8184
}
8285
}
8386

@@ -120,6 +123,7 @@ extension FeatureFlag {
120123
case .pluginManagementOverhaul: "Plugin Management Overhaul"
121124
case .readerGutenbergCommentComposer: "Gutenberg Comment Composer"
122125
case .nativeJetpackConnection: "Native Jetpack Connection"
126+
case .newsletterSubscribers: "Newsletter Subscribers"
123127
}
124128
}
125129
}

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import WordPressAuthenticator
22
import UIKit
33
import SwiftUI
44
import WordPressUI
5+
import WordPressKit
56
import GutenbergKit
67
import Combine
78

0 commit comments

Comments
 (0)