adjusted update script to be easier to read (#23)

Author: skhamis

Package.swift

@@ -1,6 +1,10 @@
 // swift-tools-version:5.4
 import PackageDescription
 
+let checksum = "f69d5c7bcde788d709944bacdeb72888beed1ec6b0a1ad32a092becdc156854b"
+let version = "v87.0.0"
+let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
+
 let package = Package(
     name: "MozillaRustComponentsSwift",
     platforms: [.iOS(.v11)],
@@ -41,8 +45,8 @@ let package = Package(
             // 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: "https://github.com/mozilla/application-services/releases/download/v87.0.0/MozillaRustComponents.xcframework.zip",
-            checksum: "f69d5c7bcde788d709944bacdeb72888beed1ec6b0a1ad32a092becdc156854b"
+            url: url,
+            checksum: checksum
 
             // 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.

automation/update_package_swift.py

@@ -2,6 +2,8 @@
 from github import Github
 import hashlib
 import requests
+import fileinput
+import sys
 
 GITHUB_REPO = "mozilla/application-services"
 XC_FRAMEWORK_NAME = "MozillaRustComponents.xcframework.zip"
@@ -12,7 +14,7 @@
 def get_xcframework_artifact():
     g = Github(github_access_token)
     repo = g.get_repo(GITHUB_REPO)
-    
+
     release = repo.get_release(as_version)
     for asset in release.get_assets():
         if asset.name == XC_FRAMEWORK_NAME:
@@ -22,38 +24,18 @@ def compute_checksum(xc_framework_url):
     req = requests.get(xc_framework_url)
     return hashlib.sha256(req.content).hexdigest()
 
-def update_package_swift(xc_framework_url, checksum):
-    old_url = ''
-    old_checksum = ''
-    with open(PACKAGE_SWIFT) as fp:
-        line = fp.readline()
-        while line:
-            line = fp.readline()
-            
-            # If this is the line that has the URL to
-            # the xcframework
-            if XC_FRAMEWORK_NAME in line:
-                url_start = line.find('"') + 1
-                url_end = line.find('"', url_start)
-                old_url = line[url_start:url_end]
-                # NOTE: We assume that the next line is the 
-                # checksum, there is a note in Package.swift
-                # to make sure we don't change that
-                line = fp.readline()
-                checksum_start = line.find('"') + 1
-                checksum_end = line.find('"', checksum_start)
-                old_checksum = line[checksum_start:checksum_end]
-                break
-    file = open(PACKAGE_SWIFT, "r+")
-    data = file.read()
-    data = data.replace(old_url, xc_framework_url)
-    data = data.replace(old_checksum, checksum)
-    file.close()
-    file = open(PACKAGE_SWIFT, "wt")
-    file.write(data)
-    file.close()
-
-
+def update_package_swift(as_version, checksum):
+    version_line = "let version ="
+    checksum_line = "let checksum ="
+
+    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"
+        sys.stdout.write(line)
 def main():
     '''
     Updates `Package.swift` with the latest
@@ -63,7 +45,7 @@ def main():
         exit(1)
     xc_framework_url = get_xcframework_artifact()
     checksum = compute_checksum(xc_framework_url)
-    update_package_swift(xc_framework_url, checksum)
+    update_package_swift(as_version, checksum)