Merge branch 'trunk' into fix/subscription-search-performance

Author: kean

.xcode-version

@@ -1 +1 @@
-26.0-rc.1-v2
+26.0

Gemfile.lock

@@ -301,7 +301,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rmagick (6.1.4)
       observer (~> 0.1)
       pkg-config (~> 1.4)

Modules/Package.swift

@@ -173,7 +173,12 @@ let package = Package(
             resources: [.process("Resources")],
             swiftSettings: [.swiftLanguageMode(.v5)]
         ),
-        .target(name: "WordPressKitObjCUtils"),
+        .target(
+            name: "WordPressKitObjCUtils",
+            cSettings: [
+                .define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release))
+            ]
+        ),
         .target(
             name: "WordPressKitModels",
             dependencies: [
@@ -189,7 +194,10 @@ let package = Package(
                 "WordPressKitModels",
                 "WordPressKitObjCUtils",
             ],
-            publicHeadersPath: "include"
+            publicHeadersPath: "include",
+            cSettings: [
+                .define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release))
+            ],
         ),
         .target(
             name: "WordPressKit",

Modules/Sources/DesignSystem/Components/FAB.swift

@@ -9,7 +9,6 @@ public struct FAB: View {
         self.action = action
     }
 
-#if compiler(>=6.2)
     public var body: some View {
         if #available(iOS 26, *) {
             Button(action: action ?? {}) {
@@ -25,11 +24,6 @@ public struct FAB: View {
             legacy
         }
     }
-#else
-    public var body: some View {
-        legacy
-    }
-#endif
 
     @ViewBuilder
     private var legacy: some View {

Modules/Sources/DesignSystem/Foundation/AppColor.swift

@@ -5,14 +5,8 @@ import BuildSettingsKit
 
 public enum UIAppColor {
     /// A tint color used in places like navigation bars.
-    ///
-    /// - note: The Jetpack app uses
     public static var tint: UIColor {
-        switch AppBrand.current {
-        case .wordpress: primary
-        case .jetpack: UIColor.label
-        case .reader: primary
-        }
+        UIColor.label
     }
 
     public static var primary: UIColor {

Modules/Sources/JetpackStats/Cards/StandaloneChartCard.swift

@@ -197,7 +197,7 @@ struct StandaloneChartCard: View {
     }
 
     private var dateRangeControls: some View {
-        HStack(spacing: Constants.step1) {
+        HStack {
             // Date range menu button
             Menu {
                 StatsDateRangePickerMenu(selection: $dateRange, isShowingCustomRangePicker: $isShowingDatePicker)
@@ -216,14 +216,15 @@ struct StandaloneChartCard: View {
             }
             .tint(Color.primary)
 
-            Spacer()
+            Spacer(minLength: Constants.step1)
 
             // Navigation controls
             HStack(spacing: 4) {
                 navigationButton(direction: .backward)
                 navigationButton(direction: .forward)
             }
         }
+        .lineLimit(1)
     }
 
     @ViewBuilder

Modules/Sources/ShareExtensionCore/Data/SharedCoreDataStack.swift

@@ -16,9 +16,7 @@ final class SharedPersistentContainer: NSPersistentContainer {
     }
 }
 
-#if compiler(>=6)
 extension SharedPersistentContainer: @unchecked Sendable {}
-#endif
 
 public final class SharedCoreDataStack {
 

Modules/Sources/WordPressKit/StatsFileDownloadsTimeIntervalData.swift

@@ -44,7 +44,7 @@ extension StatsFileDownloadsTimeIntervalData: StatsTimeIntervalData {
     public init?(date: Date, period: StatsPeriodUnit, jsonDictionary: [String: AnyObject]) {
         guard
             let unwrappedDays = type(of: self).unwrapDaysDictionary(jsonDictionary: jsonDictionary),
-            let fileDownloadsDict = unwrappedDays["files"] as? [[String: AnyObject]]
+            let fileDownloadsDict = Bamboozled.parseArray(unwrappedDays["files"])
             else {
                 return nil
         }

Modules/Sources/WordPressKit/StatsSearchTermTimeIntervalData.swift

@@ -45,7 +45,7 @@ extension StatsSearchTermTimeIntervalData: StatsTimeIntervalData {
             let totalSearchTerms = unwrappedDays["total_search_terms"] as? Int,
             let hiddenSearchTerms = unwrappedDays["encrypted_search_terms"] as? Int,
             let otherSearchTerms = unwrappedDays["other_search_terms"] as? Int,
-            let searchTermsDict = unwrappedDays["search_terms"] as? [[String: AnyObject]]
+            let searchTermsDict = Bamboozled.parseArray(unwrappedDays["search_terms"])
             else {
                 return nil
         }

Modules/Sources/WordPressKit/StatsServiceRemoteV2.swift

@@ -444,7 +444,37 @@ extension StatsTimeIntervalData {
         }
         return nil
     }
+}
 
+enum Bamboozled {
+    /// Sometimes PHP returns a dictionary with numbers as keys instead of an
+    /// actual array. This fixes it.
+    static func parseArray(_ object: AnyObject?) -> [[String: AnyObject]]? {
+        guard let object else {
+            return nil
+        }
+        if let array = object as? [[String: AnyObject]] {
+            return array
+        }
+        if let dictionary = object as? [String: [String: AnyObject]] {
+            return dictionary.sorted { lhs, rhs in
+                if let lhs = Int(lhs.key), let rhs = Int(rhs.key) {
+                    return lhs < rhs
+                }
+                return lhs.key.compare(rhs.key, options: .numeric) == .orderedAscending
+            }.map {
+                $0.value
+            }
+        }
+        if let dictionary = object as? [Int: [String: AnyObject]] {
+            return dictionary.sorted { lhs, rhs in
+                lhs.key < rhs.key
+            }.map {
+                $0.value
+            }
+        }
+        return nil
+    }
 }
 
 // We'll bring `StatsPeriodUnit` into this file when the "old" `WPStatsServiceRemote` gets removed.