Auto update with latest AS Release v93.0.0 (#47)

* Updates Package.swift with v93.0.0 release

* Version 93.0.0

Co-authored-by: Firefox Sync Engineering <[email protected]>

Author: github-actions[bot]

Package.swift

@@ -1,8 +1,8 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "a315d0dba54895526935316ecc66aa6c9a522194d02225119e6b35378c7ba914"
-let version = "v92.0.1"
+let checksum = "b0bfb2bf91bf52978b8f0450456a4e9b2f7d346d635b0ac7f743709e6eaa98cb"
+let version = "v93.0.0"
 let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
 
 let package = Package(

swift-source/Generated/Metrics/Metrics.swift

@@ -22,7 +22,7 @@ extension GleanMetrics {
             // Intentionally left private, no external user can instantiate a new global object.
         }
 
-        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 3, day: 25, hour: 15, minute: 6, second: 26))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 4, day: 14, hour: 15, minute: 6, second: 43))
     }
 
     enum NimbusEvents {

swift-source/Nimbus/Collections+.swift

@@ -4,6 +4,10 @@
 
 import Foundation
 
+#if canImport(UIKit)
+    import UIKit
+#endif
+
 public extension Dictionary {
     func mapKeysNotNull<K1>(_ transform: (Key) -> K1?) -> [K1: Value] {
         let transformed: [(K1, Value)] = compactMap { k, v in
@@ -36,3 +40,59 @@ public extension Dictionary {
         return merging(defaults, uniquingKeysWith: valueMerger)
     }
 }
+
+public extension Array where Element == Bundle {
+    /// Search through the resource bundles looking for an image of the given name.
+    ///
+    /// If no image is found in any of the `resourceBundles`, then the `nil` is returned.
+    func getImage(named name: String) -> UIImage? {
+        for bundle in self {
+            if let image = UIImage(named: name, in: bundle, compatibleWith: nil) {
+                return image
+            }
+        }
+        return nil
+    }
+
+    /// Search through the resource bundles looking for an image of the given name.
+    ///
+    /// If no image is found in any of the `resourceBundles`, then a fatal error is
+    /// thrown. This method is only intended for use with hard coded default images
+    /// when other images have been omitted or are missing.
+    ///
+    /// The two ways of fixing this would be to provide the image as its named in the `.fml.yaml`
+    /// file or to change the name of the image in the FML file.
+    func getImageNotNull(named name: String) -> UIImage {
+        guard let image = getImage(named: name) else {
+            fatalError(
+                "An image named \"\(name)\" has been named in a `.fml.yaml` file, but is missing from the asset bundle")
+        }
+        return image
+    }
+
+    /// Search through the resource bundles looking for localized strings with the given name.
+    /// If the `name` contains exactly one slash, it is split up and the first part of the string is used
+    /// as the `tableName` and the second the `key` in localized string lookup.
+    /// If no string is found in any of the `resourceBundles`, then the `name` is passed back unmodified.
+    func getString(named name: String) -> String? {
+        let parts = name.split(separator: "/", maxSplits: 1, omittingEmptySubsequences: true).map { String($0) }
+        let key: String
+        let tableName: String?
+        switch parts.count {
+        case 2:
+            tableName = parts[0]
+            key = parts[1]
+        default:
+            tableName = nil
+            key = name
+        }
+
+        for bundle in self {
+            let value = bundle.localizedString(forKey: key, value: nil, table: tableName)
+            if value != key {
+                return value
+            }
+        }
+        return nil
+    }
+}

swift-source/Nimbus/FeatureVariables.swift

@@ -26,6 +26,8 @@ import Foundation
 ///
 /// This may become the basis of a generated-from-manifest solution.
 public protocol Variables {
+    var resourceBundles: [Bundle] { get }
+
     /// Finds a string typed value for this key. If none exists, `nil` is returned.
     ///
     /// N.B. the `key` and type `String` should be listed in the experiment manifest.
@@ -241,9 +243,7 @@ private func asEnum<T: RawRepresentable>(_ string: String) -> T? where T.RawValu
     return T(rawValue: string)
 }
 
-protocol VariablesWithBundle: Variables {
-    var resourceBundles: [Bundle] { get }
-}
+protocol VariablesWithBundle: Variables {}
 
 extension VariablesWithBundle {
     func getImage(_ key: String) -> UIImage? {
@@ -289,65 +289,21 @@ extension VariablesWithBundle {
     ///
     /// If no image is found in any of the `resourceBundles`, then the `nil` is returned.
     func asImage(name: String) -> UIImage? {
-        for bundle in resourceBundles {
-            if let image = UIImage(named: name, in: bundle, compatibleWith: nil) {
-                return image
-            }
-        }
-        return nil
+        return resourceBundles.getImage(named: name)
     }
 
     /// Search through the resource bundles looking for localized strings with the given name.
     /// If the `name` contains exactly one slash, it is split up and the first part of the string is used
     /// as the `tableName` and the second the `key` in localized string lookup.
     /// If no string is found in any of the `resourceBundles`, then the `name` is passed back unmodified.
     func asLocalizedString(name: String) -> String? {
-        let parts = name.split(separator: "/", maxSplits: 1, omittingEmptySubsequences: true).map { String($0) }
-        let key: String
-        let tableName: String?
-        switch parts.count {
-        case 2:
-            tableName = parts[0]
-            key = parts[1]
-        default:
-            tableName = nil
-            key = name
-        }
-
-        for bundle in resourceBundles {
-            let value = bundle.localizedString(forKey: key, value: nil, table: tableName)
-            if value != key {
-                return value
-            }
-        }
-        return name
+        return resourceBundles.getString(named: name) ?? name
     }
 }
 
 /// A thin wrapper around the JSON produced by the `get_feature_variables_json(feature_id)` call, useful
 /// for configuring a feature, but without needing the developer to know about experiment specifics.
 internal class JSONVariables: VariablesWithBundle {
-    func asStringMap() -> [String: String]? {
-        return nil
-    }
-
-    func asIntMap() -> [String: Int]? {
-        return nil
-    }
-
-    func asBoolMap() -> [String: Bool]? {
-        return nil
-    }
-
-    func asVariablesMap() -> [String: Variables]? {
-        return json.compactMapValues { value in
-            if let jsonMap = value as? [String: Any] {
-                return JSONVariables(with: jsonMap)
-            }
-            return nil
-        }
-    }
-
     private let json: [String: Any]
     internal let resourceBundles: [Bundle]
 
@@ -370,6 +326,10 @@ internal class JSONVariables: VariablesWithBundle {
         return valueMap(key)
     }
 
+    func asStringMap() -> [String: String]? {
+        return nil
+    }
+
     func getInt(_ key: String) -> Int? {
         return value(key)
     }
@@ -382,6 +342,10 @@ internal class JSONVariables: VariablesWithBundle {
         return valueMap(key)
     }
 
+    func asIntMap() -> [String: Int]? {
+        return nil
+    }
+
     func getBool(_ key: String) -> Bool? {
         return value(key)
     }
@@ -394,6 +358,10 @@ internal class JSONVariables: VariablesWithBundle {
         return valueMap(key)
     }
 
+    func asBoolMap() -> [String: Bool]? {
+        return nil
+    }
+
     // Methods used to get sub-objects. We immediately re-wrap an JSON object if it exists.
     func getVariables(_ key: String) -> Variables? {
         if let dictionary: [String: Any] = value(key) {
@@ -415,6 +383,15 @@ internal class JSONVariables: VariablesWithBundle {
         }
     }
 
+    func asVariablesMap() -> [String: Variables]? {
+        return json.compactMapValues { value in
+            if let jsonMap = value as? [String: Any] {
+                return JSONVariables(with: jsonMap)
+            }
+            return nil
+        }
+    }
+
     private func value<T>(_ key: String) -> T? {
         return json[key] as? T
     }
@@ -438,24 +415,14 @@ internal class JSONVariables: VariablesWithBundle {
 
 // Another implementation of `Variables` may just return nil for everything.
 public class NilVariables: Variables {
-    public func asStringMap() -> [String: String]? {
-        return nil
-    }
-
-    public func asIntMap() -> [String: Int]? {
-        return nil
-    }
+    public static let instance = NilVariables()
 
-    public func asBoolMap() -> [String: Bool]? {
-        return nil
-    }
+    public private(set) var resourceBundles: [Bundle] = [Bundle.main]
 
-    public func asVariablesMap() -> [String: Variables]? {
-        return nil
+    public func set(bundles: [Bundle]) {
+        resourceBundles = bundles
     }
 
-    public static let instance: Variables = NilVariables()
-
     public func getString(_: String) -> String? {
         return nil
     }
@@ -468,6 +435,10 @@ public class NilVariables: Variables {
         return nil
     }
 
+    public func asStringMap() -> [String: String]? {
+        return nil
+    }
+
     public func getInt(_: String) -> Int? {
         return nil
     }
@@ -480,6 +451,10 @@ public class NilVariables: Variables {
         return nil
     }
 
+    public func asIntMap() -> [String: Int]? {
+        return nil
+    }
+
     public func getBool(_: String) -> Bool? {
         return nil
     }
@@ -492,6 +467,10 @@ public class NilVariables: Variables {
         return nil
     }
 
+    public func asBoolMap() -> [String: Bool]? {
+        return nil
+    }
+
     public func getImage(_: String) -> UIImage? {
         return nil
     }
@@ -527,4 +506,8 @@ public class NilVariables: Variables {
     public func getVariablesMap(_: String) -> [String: Variables]? {
         return nil
     }
+
+    public func asVariablesMap() -> [String: Variables]? {
+        return nil
+    }
 }

swift-source/Nimbus/Nimbus.swift

@@ -33,6 +33,7 @@ public class Nimbus: NimbusApi {
         self.errorReporter = errorReporter
         self.nimbusClient = nimbusClient
         self.resourceBundles = resourceBundles
+        NilVariables.instance.set(bundles: resourceBundles)
     }
 }