Ships a focus megazord and updates to 93.2.0 (#56)

* Ships a focus megazord

* Updates package swift script

* Updates package swift to use proper release url

* Updates package swift to use version 93.2.0

* Version 93.2.0

Author: Tarik Eshaq

FocusRustComponentsWrapper/dummy.m

@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// Swift Package Manager needs at least one source file.

FocusRustComponentsWrapper/include/dummy.h

@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// Swift Package Manager needs at least one header to prevent a warning. See
+// https://github.com/mozilla/application-services/issues/4422.

Package.swift

@@ -1,15 +1,19 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "3d97e0661ccc4b45ee58b35ed958e19d8e419985ea5efd9b58078dd086f057ce"
-let version = "v93.1.0"
+let checksum = "8df6c1aeb572c5efbf792b58dbe1fc4dab31672d83be2cf41c5339ef4b1680c8"
+let version = "v93.2.0"
 let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
 
+// Focus xcframework
+let focusChecksum = "2c9fbc8086c124a9256eb921290a605ec7de5e865e3cd1af6df7779662f0683a"
+let focusUrl = "https://github.com/mozilla/application-services/releases/download/\(version)/FocusRustComponents.xcframework.zip"
 let package = Package(
     name: "MozillaRustComponentsSwift",
     platforms: [.iOS(.v11)],
     products: [
         .library(name: "MozillaAppServices", targets: ["MozillaAppServices"]),
+        .library(name: "FocusAppServices", targets: ["FocusAppServices"]),
     ],
     dependencies: [
     ],
@@ -26,6 +30,13 @@ let package = Package(
             ],
             path: "MozillaRustComponentsWrapper"
         ),
+        .target(
+            name: "FocusRustComponentsWrapper",
+            dependencies: [
+                .target(name: "FocusRustComponents", condition: .when(platforms: [.iOS]))
+            ],
+            path: "FocusRustComponentsWrapper"
+        ),
         .binaryTarget(
             name: "MozillaRustComponents",
             //
@@ -40,10 +51,29 @@ let package = Package(
             //
             //path: "./MozillaRustComponents.xcframework"
         ),
+        .binaryTarget(
+            name: "FocusRustComponents",
+            //
+            // For release artifacts, reference the MozillaRustComponents as a URL with checksum.
+            // IMPORTANT: The checksum has to be on the line directly after the `url`
+            // this is important for our release script so that all values are updated correctly
+            url: focusUrl,
+            checksum: focusChecksum
+
+            // For local testing, you can point at an (unzipped) XCFramework that's part of the repo.
+            // Note that you have to actually check it in and make a tag for it to work correctly.
+            //
+            //path: "./FocusRustComponents.xcframework"
+        ),
         .target(
             name: "MozillaAppServices",
             dependencies: ["MozillaRustComponentsWrapper"],
-            path: "swift-source"
+            path: "swift-source/all"
+        ),
+        .target(
+            name: "FocusAppServices",
+            dependencies: ["FocusRustComponentsWrapper"],
+            path: "swift-source/focus"
         ),
     ]
 )

automation/update_package_swift.py

@@ -7,6 +7,8 @@
 
 GITHUB_REPO = "mozilla/application-services"
 XC_FRAMEWORK_NAME = "MozillaRustComponents.xcframework.zip"
+FOCUS_FRAMEWORK_NAME = "FocusRustComponents.xcframework.zip"
+
 PACKAGE_SWIFT = "Package.swift"
 github_access_token = os.getenv("GITHUB_TOKEN")
 as_version = os.getenv("AS_VERSION")
@@ -16,25 +18,33 @@ def get_xcframework_artifact():
     repo = g.get_repo(GITHUB_REPO)
 
     release = repo.get_release(as_version)
+    full_xcframework = None
+    focus_xcframework = None
     for asset in release.get_assets():
         if asset.name == XC_FRAMEWORK_NAME:
-            return asset.browser_download_url
+            full_xcframework = asset.browser_download_url
+        elif asset.name == FOCUS_FRAMEWORK_NAME:
+            focus_xcframework = asset.browser_download_url
+    return (full_xcframework, focus_xcframework)
 
 def compute_checksum(xc_framework_url):
     req = requests.get(xc_framework_url)
     return hashlib.sha256(req.content).hexdigest()
 
-def update_package_swift(as_version, checksum):
+def update_package_swift(as_version, checksum, focus_checksum):
     version_line = "let version ="
     checksum_line = "let checksum ="
-
+    focus_checksum_line = "let focusChecksum ="
     for line in fileinput.input(PACKAGE_SWIFT, inplace=1):
         if line.strip().startswith(version_line):
             # Replace the line with the new version included
             line = f"{version_line} \"{as_version}\"\n"
         elif line.strip().startswith(checksum_line):
             # Replace the line with the new computed checksum
             line = f"{checksum_line} \"{checksum}\"\n"
+        elif line.strip().startswith(focus_checksum_line):
+            # Replace the line with the new computed checksum
+            line = f"{focus_checksum_line} \"{focus_checksum}\"\n"
         sys.stdout.write(line)
 def main():
     '''
@@ -43,10 +53,10 @@ def main():
     '''
     if not github_access_token or not as_version:
         exit(1)
-    xc_framework_url = get_xcframework_artifact()
+    xc_framework_url, focus_xcframework_url = get_xcframework_artifact()
     checksum = compute_checksum(xc_framework_url)
-    update_package_swift(as_version, checksum)
-
+    focus_checksum = compute_checksum(focus_xcframework_url)
+    update_package_swift(as_version, checksum, focus_checksum)
 
 
 if __name__ == '__main__':

generate.sh

@@ -21,9 +21,12 @@ GLEAN_GENERATOR="$APP_SERVICES_DIR/components/external/glean/glean-core/ios/sdk_
 
 set -euvx
 
-OUT_DIR="$THIS_DIR/swift-source"
+OUT_DIR="$THIS_DIR/swift-source/all"
+FOCUS_DIR="$THIS_DIR/swift-source/focus"
 
 rm -rf "$OUT_DIR" && mkdir -p "$OUT_DIR"
+rm -rf "$FOCUS_DIR" && mkdir -p "$FOCUS_DIR"
+
 
 # Glean metrics.
 # Run this first, because it appears to delete any other .swift files in the output directory.
@@ -139,4 +142,44 @@ cp -r "$APP_SERVICES_DIR/components/rc_log/ios/" $OUT_DIR
 # We only need to copy the hand-written Swift, Viaduct does not use `uniffi` yet
 cp -r "$APP_SERVICES_DIR/components/viaduct/ios/" $OUT_DIR
 
+
+###################### Swift code generation for Focus ######################
+# Glean metrics.
+# Run this first, because it appears to delete any other .swift files in the output directory.
+# Also, it wants to be run from inside Xcode, so we set some env vars to fake it out.
+SOURCE_ROOT="$THIS_DIR" PROJECT="FocusAppServices" "$GLEAN_GENERATOR" -o "$FOCUS_DIR/Generated/Metrics/" "$APP_SERVICES_DIR/components/nimbus/metrics.yaml"
+
+
+
+###
+#
+# Nimbus
+#
+###
+# UniFFI bindings.
+"${UNIFFI_BINDGEN[@]}" generate -l swift -o "$FOCUS_DIR/Generated" "$APP_SERVICES_DIR/components/nimbus/src/nimbus.udl"
+# Copy the hand-written Swift, since it all needs to be together in one directory.
+cp -r "$APP_SERVICES_DIR/components/nimbus/ios/Nimbus" "$FOCUS_DIR"
+
+###
+#
+# RustLog
+#
+###
+
+# We only need to copy the hand-written Swift, RustLog does not use `uniffi` yet
+cp -r "$APP_SERVICES_DIR/components/rc_log/ios/" $FOCUS_DIR
+
+
+###
+#
+# Viaduct
+#
+###
+
+# We only need to copy the hand-written Swift, Viaduct does not use `uniffi` yet
+cp -r "$APP_SERVICES_DIR/components/viaduct/ios/" $FOCUS_DIR
+
+
+
 echo "Successfully generated uniffi code!"