Merge branch 'trunk' into tooling/migrate-from-appcenter-to-fad

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	WordPress/WordPress-Internal-Info.plist
#	WordPress/Wordpress-Alpha-Info.plist

Author: AliSoftware

.editorconfig

@@ -1,9 +1,23 @@
+root = true
+
 # Apply to all files
 [*]
+indent_style = space
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
+charset = utf-8
 trim_trailing_whitespace = true
 
+[*.md]
+trim_trailing_whitespace = false
+
+[*.swift]
+indent_size = 4
+
+[{*.h,*.m}]
+indent_size = 4
+
 # Ruby specific rules
 [{*.rb,Fastfile,Gemfile}]
 indent_style = space

Gemfile

@@ -8,15 +8,15 @@ gem 'dotenv'
 #
 # See failures like https://buildkite.com/automattic/wordpress-ios/builds/24053#019234f2-80a5-40f6-b55e-2f420e6483a8/3840-3915
 # and https://github.com/fastlane/fastlane/pull/22256
-gem 'fastlane', '~> 2.226'
+gem 'fastlane', '~> 2.227'
 gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'
 gem 'fastlane-plugin-sentry'
 # This comment avoids typing to switch to a development version for testing.
 #
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref: ''
 gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.0'
 gem 'rake'
-gem 'rubocop', '~> 1.72'
+gem 'rubocop', '~> 1.74'
 gem 'rubocop-rake', '~> 0.7'
 gem 'xcpretty-travis-formatter'
 

Gemfile.lock

@@ -23,9 +23,9 @@ GEM
     artifactory (3.0.17)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.3.1)
-    aws-partitions (1.1054.0)
-    aws-sdk-core (3.219.0)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1068.0)
+    aws-sdk-core (3.220.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -124,7 +124,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.226.0)
+    fastlane (2.227.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -214,12 +214,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -243,7 +243,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.10.1)
+    json (2.10.2)
     jwt (2.10.1)
       base64
     kramdown (2.5.1)
@@ -303,7 +303,7 @@ GEM
       observer (~> 0.1)
       pkg-config (~> 1.4)
     rouge (3.28.0)
-    rubocop (1.72.2)
+    rubocop (1.74.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -314,7 +314,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
+    rubocop-ast (1.39.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
@@ -368,13 +368,13 @@ PLATFORMS
 DEPENDENCIES
   danger-dangermattic (~> 1.2)
   dotenv
-  fastlane (~> 2.226)
+  fastlane (~> 2.227)
   fastlane-plugin-firebase_app_distribution (~> 0.10)
   fastlane-plugin-sentry
   fastlane-plugin-wpmreleasetoolkit (~> 13.0)
   rake
   rmagick (~> 6.1.1)
-  rubocop (~> 1.72)
+  rubocop (~> 1.74)
   rubocop-rake (~> 0.7)
   xcpretty-travis-formatter
 

Modules/Package.swift

@@ -59,14 +59,24 @@ let package = Package(
             .product(name: "Collections", package: "swift-collections"),
             .product(name: "Gifu", package: "Gifu"),
         ]),
-        .target(name: "DesignSystem", swiftSettings: [.swiftLanguageMode(.v5)]),
+        .target(name: "BuildSettingsKit"),
+        .target(
+            name: "DesignSystem",
+            dependencies: [
+                "BuildSettingsKit",
+                .product(name: "ColorStudio", package: "color-studio"),
+            ],
+            resources: [.process("Resources")],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
         // SFHFKeychainUtils is an old Objective-C keychain wrapper.
         // The implementatoin predates ARC, hence the dedicated target with ARC disabled, for the time being.
         .target(
             name: "SFHFKeychainUtils",
             cSettings: [.unsafeFlags(["-fno-objc-arc"])]
         ),
+        .target(name: "TextBundle"),
         .target(name: "UITestsFoundation", dependencies: [
             .product(name: "ScreenObject", package: "ScreenObject"),
             .product(name: "XCUITestHelpers", package: "ScreenObject"),
@@ -82,11 +92,19 @@ let package = Package(
         .target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressCore", dependencies: [.target(name: "WordPressShared"), .product(name: "WordPressAPI", package: "wordpress-rs")]),
         .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
-        .target(name: "WordPressShared", dependencies: [.target(name: "WordPressSharedObjC")], resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
+        .target(
+            name: "WordPressShared",
+            dependencies: [
+                .target(name: "SFHFKeychainUtils"),
+                .target(name: "WordPressSharedObjC"),
+            ],
+            resources: [.process("Resources")],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "WordPressTesting", resources: [.process("Resources")]),
         .target(
             name: "WordPressUI",
-            dependencies: ["AsyncImageKit", "WordPressShared"],
+            dependencies: ["AsyncImageKit", "DesignSystem", "WordPressShared"],
             resources: [.process("Resources")],
             swiftSettings: [.swiftLanguageMode(.v5)]
         ),
@@ -142,6 +160,7 @@ enum XcodeSupport {
 
     static var targets: [Target] {
         let wordPresAuthentificatorDependencies: [Target.Dependency] = [
+            "BuildSettingsKit",
             "WordPressShared",
             "WordPressUI",
             .product(name: "Gridicons", package: "Gridicons-iOS"),
@@ -153,16 +172,17 @@ enum XcodeSupport {
         ]
 
         let shareAndDraftExtensionsDependencies: [Target.Dependency] = [
+            "BuildSettingsKit",
             "SFHFKeychainUtils",
             "WordPressShared",
             "WordPressUI",
+            "TextBundle",
             .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             .product(name: "Down", package: "Down"),
             .product(name: "Gridicons", package: "Gridicons-iOS"),
             .product(name: "Reachability", package: "Reachability"),
             .product(name: "SVProgressHUD", package: "SVProgressHUD"),
             .product(name: "ZIPFoundation", package: "ZIPFoundation"),
-            .product(name: "ColorStudio", package: "color-studio"),
             .product(name: "Aztec", package: "AztecEditor-iOS"),
             .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
         ]
@@ -175,6 +195,7 @@ enum XcodeSupport {
         return [
             .xcodeTarget("XcodeTarget_App", dependencies: [
                 "DesignSystem",
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 "SFHFKeychainUtils",
                 "WordPressData",
@@ -228,17 +249,19 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [
                 "SFHFKeychainUtils",
                 "WordPressShared",
+                "BuildSettingsKit",
             ]),
             .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 "SFHFKeychainUtils",
                 "WordPressShared",
                 "WordPressUI",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                 .product(name: "WordPressAPI", package: "wordpress-rs"),
-                .product(name: "ColorStudio", package: "color-studio"),
             ]),
             .xcodeTarget("XcodeTarget_Intents", dependencies: [
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             ]),

Modules/Sources/BuildSettingsKit/BuildSettings+Live.swift

@@ -0,0 +1,48 @@
+import Foundation
+
+extension BuildSettings {
+    static let live = BuildSettings(bundle: .app)
+
+    init(bundle: Bundle) {
+        brand = AppBrand(rawValue: bundle.infoValue(forKey: "WPAppBrand"))!
+        pushNotificationAppID = bundle.infoValue(forKey: "WPPushNotificationAppID")
+        appGroupName = bundle.infoValue(forKey: "WPAppGroupName")
+        appKeychainAccessGroup = bundle.infoValue(forKey: "WPAppKeychainAccessGroup")
+        eventNamePrefix = bundle.infoValue(forKey: "WPEventNamePrefix")
+        explatPlatform = bundle.infoValue(forKey: "WPExplatPlatform")
+    }
+}
+
+private extension Bundle {
+    func infoValue<T>(forKey key: String) -> T where T: LosslessStringConvertible {
+        guard let object = object(forInfoDictionaryKey: key) else {
+            fatalError("missing value for key: \(key)")
+        }
+        switch object {
+        case let value as T:
+            return value
+        case let string as String:
+            guard let value = T(string) else { fallthrough }
+            return value
+        default:
+            fatalError("unexpected value: \(object) for key: \(key)")
+        }
+    }
+}
+
+private extension Bundle {
+    /// Returns the `Bundle` for the host `.app`.
+    ///
+    /// - If this is called from code already located in the main app's bundle or from a Pod/Framework,
+    ///   this will return the same as `Bundle.main`, aka the bundle of the app itself.
+    /// - If this is called from an App Extension (Widget, ShareExtension, etc), this will return the bundle of the
+    ///   main app hosting said App Extension (while `Bundle.main` would return the App Extension itself)
+    static let app: Bundle = {
+        var url = Bundle.main.bundleURL
+        while url.pathExtension != "app" && url.lastPathComponent != "/" {
+            url.deleteLastPathComponent()
+        }
+        guard let appBundle = Bundle(url: url) else { fatalError("Unable to find the parent app bundle") }
+        return appBundle
+    }()
+}

Modules/Sources/BuildSettingsKit/BuildSettings+Preview.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+/// The container for Xcode previews.
+extension BuildSettings {
+    nonisolated(unsafe) static var preview = BuildSettings(
+        brand: .jetpack,
+        pushNotificationAppID: "xcpreview_push_notification_id",
+        appGroupName: "xcpreview_app_group_name",
+        appKeychainAccessGroup: "xcpreview_app_keychain_access_group",
+        eventNamePrefix: "xcpreview",
+        explatPlatform: "xcpreview"
+    )
+}
+
+extension BuildSettings {
+    /// Updates the preview settings for the lifetime of the given closure.
+    /// Reverts to the original settings when done.
+    @MainActor
+    public static func withSettings<T>(_ configure: (inout BuildSettings) -> Void, perform closure: () -> T) -> T {
+        var container = BuildSettings.preview
+        let original = container
+        configure(&container)
+        BuildSettings.preview = container
+        let value = closure()
+        BuildSettings.preview = original
+        return value
+    }
+}

Modules/Sources/BuildSettingsKit/BuildSettings.swift

@@ -0,0 +1,37 @@
+import Foundation
+
+/// Manages global build settings.
+///
+/// The build settings work differently depending on the environment:
+///
+/// - **Live** – the code runs as part of an app or app extensions with build
+/// settings configured using the `Info.plist` file.
+/// - **Preview** – the code runs as part of the SwiftPM or Xcode target. In this
+/// environment, the build settings have predefined values that can also be
+/// changed at runtime.
+/// - **Test** – `BuildSettings` are not available when running unit tests as
+/// they are incompatible with parallelized tests and are generally not recommended.
+public struct BuildSettings: Sendable {
+    public var brand: AppBrand
+    public var pushNotificationAppID: String
+    public var appGroupName: String
+    public var appKeychainAccessGroup: String
+    public var eventNamePrefix: String
+    public var explatPlatform: String
+
+    public static var current: BuildSettings {
+        switch BuildSettingsEnvironment.current {
+        case .live:
+            return .live
+        case .preview:
+            return .preview
+        case .test:
+            fatalError("BuildSettings are unavailable when running unit tests. Make sure to inject the values manually in system under test.")
+        }
+    }
+}
+
+public enum AppBrand: String, Sendable {
+    case wordpress
+    case jetpack
+}

Modules/Sources/BuildSettingsKit/BuildSettingsEnvironment.swift

@@ -0,0 +1,40 @@
+import Foundation
+
+public enum BuildSettingsEnvironment: Sendable {
+    case live
+    case preview
+    case test
+
+    public static let current: BuildSettingsEnvironment = {
+#if DEBUG
+        let processInfo = ProcessInfo.processInfo
+        if processInfo.isXcodePreview {
+            return .preview
+        }
+        if processInfo.isTesting {
+            return .test
+        }
+#endif
+        return .live
+    }()
+}
+
+private extension ProcessInfo {
+    var isXcodePreview: Bool {
+        environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"
+    }
+
+    var isTesting: Bool {
+        if environment.keys.contains("XCTestBundlePath") { return true }
+        if environment.keys.contains("XCTestConfigurationFilePath") { return true }
+        if environment.keys.contains("XCTestSessionIdentifier") { return true }
+
+        return arguments.contains { argument in
+            let path = URL(fileURLWithPath: argument)
+            return path.lastPathComponent == "swiftpm-testing-helper"
+            || argument == "--testing-library"
+            || path.lastPathComponent == "xctest"
+            || path.pathExtension == "xctest"
+        }
+    }
+}