From e90aaa750b5b13219a78f898de5556e36a3977d1 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Mon, 27 Oct 2025 15:58:41 +0100 Subject: [PATCH] Update to Glean v66.0.1 --- MozillaRustComponents/Package.resolved | 6 +-- MozillaRustComponents/Package.swift | 2 +- firefox-ios/Client.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +-- firefox-ios/bin/sdk_generator.sh | 4 +- .../Blockzilla.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 13 +++++- focus-ios/bin/sdk_generator.sh | 42 ++++++++++++++----- 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/MozillaRustComponents/Package.resolved b/MozillaRustComponents/Package.resolved index dd0cd92351ff..6cfbe7bf391c 100644 --- a/MozillaRustComponents/Package.resolved +++ b/MozillaRustComponents/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "0b3b133588d441754b48063b0d4b1cd15d7db83f16087b2b639c07d634de8bfd", + "originHash" : "acf240db3c33fe812c597c11a14e20130d176804ab9554702efcab3e2bfa46c3", "pins" : [ { "identity" : "glean-swift", "kind" : "remoteSourceControl", "location" : "https://github.com/mozilla/glean-swift", "state" : { - "revision" : "fe1b951f1e89ce182a56982234f6803f0c16e8ea", - "version" : "65.1.1" + "revision" : "ee355a445d475c5c4d21e2d4ad14e46a0a600606", + "version" : "66.0.1" } } ], diff --git a/MozillaRustComponents/Package.swift b/MozillaRustComponents/Package.swift index 043deaa373fe..22b248626d1e 100644 --- a/MozillaRustComponents/Package.swift +++ b/MozillaRustComponents/Package.swift @@ -17,7 +17,7 @@ let package = Package( .library(name: "FocusRustComponents", targets: ["FocusAppServices"]), ], dependencies: [ - .package(url: "https://github.com/mozilla/glean-swift", from: "65.1.1"), + .package(url: "https://github.com/mozilla/glean-swift", from: "66.0.1"), ], targets: [ // A wrapper around our binary target that combines + any swift files we want to expose to the user diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj index a1c261bde2b4..e7e4b723ca89 100644 --- a/firefox-ios/Client.xcodeproj/project.pbxproj +++ b/firefox-ios/Client.xcodeproj/project.pbxproj @@ -30424,7 +30424,7 @@ repositoryURL = "https://github.com/mozilla/glean-swift"; requirement = { kind = exactVersion; - version = 65.1.1; + version = 66.0.1; }; }; 4368F83B279669690013419B /* XCRemoteSwiftPackageReference "SnapKit" */ = { diff --git a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3192611ef48c..b3c11e96d48e 100644 --- a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "b9390197cb2d14000a3cb4b2d20d891d52099dc16d712955511c184198ed16b5", + "originHash" : "34c532ccad0be50c1340ae9fc0fbb1a9224ba08f5a9f9d254df5f5679a6343e1", "pins" : [ { "identity" : "a-star", @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mozilla/glean-swift", "state" : { - "revision" : "fe1b951f1e89ce182a56982234f6803f0c16e8ea", - "version" : "65.1.1" + "revision" : "ee355a445d475c5c4d21e2d4ad14e46a0a600606", + "version" : "66.0.1" } }, { diff --git a/firefox-ios/bin/sdk_generator.sh b/firefox-ios/bin/sdk_generator.sh index 256ed51e9ed6..9c5e630eb374 100755 --- a/firefox-ios/bin/sdk_generator.sh +++ b/firefox-ios/bin/sdk_generator.sh @@ -25,7 +25,7 @@ set -e -GLEAN_PARSER_VERSION=17.1 +GLEAN_PARSER_VERSION=18.0 # CMDNAME is used in the usage text below. # shellcheck disable=SC2034 @@ -190,6 +190,8 @@ VENVDIR="${SOURCE_ROOT}/.venv" | sed 's/^\(.\)/warning: \1/' \ | sed '/Your metrics are Glean/s/^warning: //' +# Any of the below variables might be empty, so by not quoting them we ensure they are just left out as arguments +# shellcheck disable=SC2086 PARSER_OUTPUT=$("${VENVDIR}"/bin/python -m glean_parser \ translate \ -f "swift" \ diff --git a/focus-ios/Blockzilla.xcodeproj/project.pbxproj b/focus-ios/Blockzilla.xcodeproj/project.pbxproj index 013f81a93ed6..3d5c697db118 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.pbxproj +++ b/focus-ios/Blockzilla.xcodeproj/project.pbxproj @@ -7321,7 +7321,7 @@ repositoryURL = "https://github.com/mozilla/glean-swift"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 65.0.2; + minimumVersion = 66.0.1; }; }; F8324C2D264C807C007E4BFA /* XCRemoteSwiftPackageReference "SnapKit" */ = { diff --git a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a3a7c9e049a8..9daf389a1300 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -10,6 +10,15 @@ "version": "7.1.1" } }, + { + "package": "Down", + "repositoryURL": "https://github.com/johnxnguyen/Down.git", + "state": { + "branch": null, + "revision": "f34b166be1f1db4aa8f573067e901d72f2a6be57", + "version": "0.11.0" + } + }, { "package": "Fuzi", "repositoryURL": "https://github.com/nbhasin2/Fuzi.git", @@ -33,8 +42,8 @@ "repositoryURL": "https://github.com/mozilla/glean-swift", "state": { "branch": null, - "revision": "66f147123dc25b22d4a66f22def5077da4dbba63", - "version": "65.0.2" + "revision": "ee355a445d475c5c4d21e2d4ad14e46a0a600606", + "version": "66.0.1" } }, { diff --git a/focus-ios/bin/sdk_generator.sh b/focus-ios/bin/sdk_generator.sh index 0a3cccdc67f9..9c5e630eb374 100644 --- a/focus-ios/bin/sdk_generator.sh +++ b/focus-ios/bin/sdk_generator.sh @@ -20,12 +20,12 @@ # 4. Add your definition files (`metrics.yaml`, `pings.yaml`, `tags.yaml`) as Input Files for the "Run Script" step. # 5. Run the build. # 6. Add the files in the `Generated` folder to your project. -# 7. Add the same files from the `Generated` folder as Output Files of the newly created "Run SCript" step. +# 7. Add the same files from the `Generated` folder as Output Files of the newly created "Run Script" step. # 8. Start using the generated metrics. set -e -GLEAN_PARSER_VERSION=17.1 +GLEAN_PARSER_VERSION=18.0 # CMDNAME is used in the usage text below. # shellcheck disable=SC2034 @@ -122,23 +122,43 @@ while (( "$#" )); do done if [ "$ACTION" = "indexbuild" ]; then - echo "Skipping code generation in 'indexbuild' build. See https://bugzilla.mozilla.org/show_bug.cgi?id=1744504 for more info." - exit 0 + echo "Skipping code generation in 'indexbuild' build. See https://bugzilla.mozilla.org/show_bug.cgi?id=1744504 for more info." + exit 0 fi if [ "${#PARAMS[@]}" -gt 0 ]; then YAML_FILES=("${PARAMS[@]}") else - if [ -z "$SCRIPT_INPUT_FILE_COUNT" ] || [ "$SCRIPT_INPUT_FILE_COUNT" -eq 0 ]; then + # Check if at least one input file and/or one input file list has been specified + if [[ (-z "$SCRIPT_INPUT_FILE_COUNT" || "$SCRIPT_INPUT_FILE_COUNT" -eq 0) && (-z "$SCRIPT_INPUT_FILE_LIST_COUNT" || "$SCRIPT_INPUT_FILE_LIST_COUNT" -eq 0) ]]; then echo "warning: No input files specified." exit 0 fi - for i in $(seq 0 $((SCRIPT_INPUT_FILE_COUNT - 1))); do - infilevar="SCRIPT_INPUT_FILE_${i}" - infile="${!infilevar}" - YAML_FILES+=("${infile}") - done + if [ "$SCRIPT_INPUT_FILE_COUNT" -gt 0 ]; then + echo "Processing $SCRIPT_INPUT_FILE_COUNT single file inputs..." + # Append the content of single input files + for i in $(seq 0 $((SCRIPT_INPUT_FILE_COUNT - 1))); do + infilevar="SCRIPT_INPUT_FILE_${i}" + infile="${!infilevar}" + YAML_FILES+=("${infile}") + done + fi + + if [ "$SCRIPT_INPUT_FILE_LIST_COUNT" -gt 0 ]; then + echo "Processing $SCRIPT_INPUT_FILE_LIST_COUNT file lists..." + # Append the content of any file lists (lists of file paths) + for i in $(seq 0 $((SCRIPT_INPUT_FILE_LIST_COUNT - 1))); do + infilevar="SCRIPT_INPUT_FILE_LIST_${i}" + infile="${!infilevar}" + + while read -r line; do + YAML_FILES+=("${line}") + done <"$infile" + done + fi + + echo "Discovered YAML input files: ${YAML_FILES[*]}" fi if [ -z "$SOURCE_ROOT" ]; then @@ -170,6 +190,8 @@ VENVDIR="${SOURCE_ROOT}/.venv" | sed 's/^\(.\)/warning: \1/' \ | sed '/Your metrics are Glean/s/^warning: //' +# Any of the below variables might be empty, so by not quoting them we ensure they are just left out as arguments +# shellcheck disable=SC2086 PARSER_OUTPUT=$("${VENVDIR}"/bin/python -m glean_parser \ translate \ -f "swift" \