Skip to content

Add Newsletter Subscribers FF and update WPKit #24507

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
merged 4 commits into from
Apr 30, 2025
Merged

Add Newsletter Subscribers FF and update WPKit #24507

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
d1a2db0
Add Newsletter Subscribers FF
kean Apr 28, 2025
ab66824
Update WPKit
kean Apr 28, 2025
374db78
Update WPKit
kean Apr 30, 2025
27b0c00
Update tests
kean Apr 30, 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
4 changes: 2 additions & 2 deletions Tests/KeystoneTests/Tests/Utility/MockWordPressComRestApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class MockWordPressComRestApi: WordPressComRestApi {
override func perform<T: Decodable>(
_ 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
Expand All @@ -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<AnyObject> {
switch method {
Expand Down
4 changes: 2 additions & 2 deletions WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "49004416c56353c89015a6a59fdf567724f1b9bc66e98dc7c462aa05f0d6adc0",
"originHash" : "0ed52b944e605856a7ca56314dcbfee8c4c681a2a599fd3ef8d32d3c7ba95616",
"pins" : [
{
"identity" : "alamofire",
Expand Down Expand Up @@ -393,7 +393,7 @@
"location" : "https://github.com/wordpress-mobile/WordPressKit-iOS",
"state" : {
"branch" : "wpios-edition",
"revision" : "94cbe7ed4ec184f104cc8e3c4c525c26e639c932"
"revision" : "5bc08764d2025e21685816065f611e884c8672d1"
}
},
{
Expand Down
4 changes: 4 additions & 0 deletions WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -78,6 +79,8 @@ public enum FeatureFlag: Int, CaseIterable {
return false
case .nativeJetpackConnection:
return BuildConfiguration.current == .debug
case .newsletterSubscribers:
return BuildConfiguration.current == .debug
}
}

Expand Down Expand Up @@ -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"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import WordPressAuthenticator
import UIKit
import SwiftUI
import WordPressUI
import WordPressKit
import GutenbergKit
import Combine

Expand Down