Merge release/25.9.1 into trunk (#24566)

* Bump version number

* Add secrets to JetpackStatsWidgets (#24565)

* Add secrets to JetpackStatsWidgets

* Delete copied code

* Add secrets to WordpressShareExtension and WordPressDraftActionExtension

* Add secrets to JetpackShareExtension and JetpackDraftActionExtension

* Add secrets to JetpackNotificationServiceExtension and WordPressNotificationServiceExtension

* Add secrets to JetpackIntents

---------

Co-authored-by: Tony Li <[email protected]>

Author: wpmobilebot

Scripts/BuildPhases/GenerateCredentials.sh

@@ -60,18 +60,20 @@ EXAMPLE_SECRETS_FILE="${SRCROOT}/Credentials/Secrets-example.swift"
 ensure_is_in_input_files_list $EXAMPLE_SECRETS_FILE
 
 # The Secrets file destination
-SECRETS_DESTINATION_FILE="${BUILD_DIR}/Secrets/Secrets.swift"
-mkdir -p $(dirname "$SECRETS_DESTINATION_FILE")
+SECRETS_DESTINATION_FILE="${SCRIPT_OUTPUT_FILE_0}"
+mkdir -p "$(dirname "$SECRETS_DESTINATION_FILE")"
 
+WORDPRESS_TARGETS=("WordPress" "WordPressShareExtension" "WordPressDraftActionExtension" "WordPressNotificationServiceExtension")
 # If the WordPress Production Secrets are available for WordPress, use them
-if [ -f "$WORDPRESS_SECRETS_FILE" ] && [ "${TARGET_NAME}" == "WordPress" ]; then
+if [ -f "$WORDPRESS_SECRETS_FILE" ] && [[ " ${WORDPRESS_TARGETS[*]} " == *" $TARGET_NAME "* ]]; then
     echo "Applying Production Secrets"
     cp -v "$WORDPRESS_SECRETS_FILE" "${SECRETS_DESTINATION_FILE}"
     exit 0
 fi
 
+JETPACK_TARGETS=("Jetpack" "JetpackStatsWidgets" "JetpackShareExtension" "JetpackDraftActionExtension" "JetpackNotificationServiceExtension" "JetpackIntents")
 # If the Jetpack Secrets are available and if we're building Jetpack use them
-if [ -f "$JETPACK_SECRETS_FILE" ] && [ "${TARGET_NAME}" == "Jetpack" ]; then
+if [ -f "$JETPACK_SECRETS_FILE" ] && [[ " ${JETPACK_TARGETS[*]} " == *" $TARGET_NAME "* ]]; then
     echo "Applying Jetpack Secrets"
     cp -v "$JETPACK_SECRETS_FILE" "${SECRETS_DESTINATION_FILE}"
     exit 0

Sources/JetpackStatsWidgets/Sources/StatsWidgets.swift

@@ -1,8 +1,13 @@
 import SwiftUI
 import WidgetKit
+import BuildSettingsKit
 
 @main
 struct JetpackStatsWidgets: WidgetBundle {
+    init() {
+        BuildSettings.configure(secrets: ApiCredentials.toSecrets())
+    }
+
     var body: some Widget {
         HomeWidgetToday()
         HomeWidgetThisWeek()

WordPress/JetpackIntents/IntentHandler.swift

@@ -1,9 +1,16 @@
 import Intents
+import BuildSettingsKit
 
 class IntentHandler: INExtension, SelectSiteIntentHandling {
 
     let sitesDataProvider = SitesDataProvider()
 
+    override init() {
+        super.init()
+
+        BuildSettings.configure(secrets: ApiCredentials.toSecrets())
+    }
+
     // MARK: - INIntentHandlerProviding
 
     override func handler(for intent: INIntent) -> Any {

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -31,6 +31,12 @@ class NotificationService: UNNotificationServiceExtension {
 
     private let appKeychainAccessGroup = BuildSettings.current.appKeychainAccessGroup
 
+    override init() {
+        super.init()
+
+        BuildSettings.configure(secrets: ApiCredentials.toSecrets())
+    }
+
     // MARK: UNNotificationServiceExtension
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {

WordPress/WordPressNotificationServiceExtension/Sources/NotificationService.swift

@@ -64,6 +64,7 @@ class MainShareViewController: UIViewController {
 
     override open func viewDidLoad() {
         super.viewDidLoad()
+        BuildSettings.configure(secrets: ApiCredentials.toSecrets())
         trackExtensionLaunch()
         loadAndPresentNavigationVC()
     }

WordPress/WordPressShareExtension/Sources/UI/MainShareViewController.swift

@@ -1,2 +1,2 @@
-VERSION_LONG = 25.9.0.3
-VERSION_SHORT = 25.9
+VERSION_LONG = 25.9.1.0
+VERSION_SHORT = 25.9.1