Merge pull request #7721 from woocommerce/widgets/update-deployment-target

Widgets: Update deployment target

Author: ealeksandrov

WooCommerce/StoreWidgets/StoreInfoProvider.swift

@@ -66,13 +66,7 @@ final class StoreInfoProvider: TimelineProvider {
     ///
     func placeholder(in context: Context) -> StoreInfoEntry {
         let dependencies = Self.fetchDependencies()
-        return StoreInfoEntry.data(.init(range: Localization.today,
-                                         name: dependencies?.storeName ?? Localization.myShop,
-                                         revenue: Self.formattedAmountString(for: 132.234, with: dependencies?.storeCurrencySettings),
-                                         visitors: "67",
-                                         orders: "23",
-                                         conversion: Self.formattedConversionString(for: 23/67),
-                                         updatedTime: Self.currentFormattedTime()))
+        return Self.placeholderEntry(for: dependencies)
     }
 
     /// Quick Snapshot. Required when previewing the widget.
@@ -93,21 +87,11 @@ final class StoreInfoProvider: TimelineProvider {
         Task {
             do {
                 let todayStats = try await strongService.fetchTodayStats(for: dependencies.storeID)
-
-                let entry = StoreInfoEntry.data(.init(range: Localization.today,
-                                                      name: dependencies.storeName,
-                                                      revenue: Self.formattedAmountString(for: todayStats.revenue, with: dependencies.storeCurrencySettings),
-                                                      visitors: "\(todayStats.totalVisitors)",
-                                                      orders: "\(todayStats.totalOrders)",
-                                                      conversion: Self.formattedConversionString(for: todayStats.conversion),
-                                                      updatedTime: Self.currentFormattedTime()))
-
+                let entry = Self.dataEntry(for: todayStats, with: dependencies)
                 let reloadDate = Date(timeIntervalSinceNow: reloadInterval)
                 let timeline = Timeline<StoreInfoEntry>(entries: [entry], policy: .after(reloadDate))
                 completion(timeline)
-
             } catch {
-
                 // WooFoundation does not expose `DDLOG` types. Should we include them?
                 print("⛔️ Error fetching today's widget stats: \(error)")
 
@@ -148,8 +132,34 @@ private extension StoreInfoProvider {
     }
 }
 
+/// Data configuration
+///
 private extension StoreInfoProvider {
 
+    /// Redacted entry with sample data. If dependencies are available - store name and currency settings will be used.
+    ///
+    static func placeholderEntry(for dependencies: Dependencies?) -> StoreInfoEntry {
+        StoreInfoEntry.data(.init(range: Localization.today,
+                                  name: dependencies?.storeName ?? Localization.myShop,
+                                  revenue: Self.formattedAmountString(for: 132.234, with: dependencies?.storeCurrencySettings),
+                                  visitors: "67",
+                                  orders: "23",
+                                  conversion: Self.formattedConversionString(for: 23/67),
+                                  updatedTime: Self.currentFormattedTime()))
+    }
+
+    /// Real data entry.
+    ///
+    static func dataEntry(for todayStats: StoreInfoDataService.Stats, with dependencies: Dependencies) -> StoreInfoEntry {
+        StoreInfoEntry.data(.init(range: Localization.today,
+                                  name: dependencies.storeName,
+                                  revenue: Self.formattedAmountString(for: todayStats.revenue, with: dependencies.storeCurrencySettings),
+                                  visitors: "\(todayStats.totalVisitors)",
+                                  orders: "\(todayStats.totalOrders)",
+                                  conversion: Self.formattedConversionString(for: todayStats.conversion),
+                                  updatedTime: Self.currentFormattedTime()))
+    }
+
     static func formattedAmountString(for amountValue: Decimal, with currencySettings: CurrencySettings?) -> String {
         let currencyFormatter = CurrencyFormatter(currencySettings: currencySettings ?? CurrencySettings())
         return currencyFormatter.formatAmount(amountValue) ?? Constants.valuePlaceholderText

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -11100,7 +11100,6 @@
 				INFOPLIST_FILE = StoreWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = StoreWidgets;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Automattic. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -11135,7 +11134,6 @@
 				INFOPLIST_FILE = StoreWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = StoreWidgets;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Automattic. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -11169,7 +11167,6 @@
 				INFOPLIST_FILE = StoreWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = StoreWidgets;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Automattic. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",