From 8c5ffafee14c04a3a91db927672f076ea68a0d80 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 17 Mar 2026 14:49:19 -0400 Subject: [PATCH 1/4] Update Kotlin to version 2.3.20 --- gradle/libs.versions.toml | 2 +- libs/verify-android-ci-environment.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4aa211f7fe..b9c9b373d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ protobuf = "4.33.2" protobuf-plugin = "0.9.6" # Kotlin -kotlin = "2.3.10" +kotlin = "2.3.20" coroutines = "1.10.2" kotlinx-serialization = "1.10.0" diff --git a/libs/verify-android-ci-environment.sh b/libs/verify-android-ci-environment.sh index 4daa8489c9..22cf8eeb2e 100755 --- a/libs/verify-android-ci-environment.sh +++ b/libs/verify-android-ci-environment.sh @@ -64,7 +64,7 @@ if [[ ! -d "$ANDROID_HOME/cmdline-tools" ]]; then echo "Android SDK is missing command line tools. Install them via Android Studio -> SDK Manager -> SDK Tools." exit 1 fi -"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "ndk;$(./gradlew -q printNdkVersion | tail -1)" +#"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "ndk;$(./gradlew -q printNdkVersion | tail -1)" # CI just downloads these libs anyway. if [[ -z "${CI}" ]]; then From e0789abc40c767dc8cb15fda76781731d8e19c93 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 17 Mar 2026 15:09:41 -0400 Subject: [PATCH 2/4] Update some miscellaneous Gradle dependencies --- gradle/libs.versions.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b9c9b373d5..f65c2baf4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ android-gradle-plugin = "8.13.2" # Google -protobuf = "4.33.2" +protobuf = "4.34.1" protobuf-plugin = "0.9.6" # Kotlin @@ -17,7 +17,7 @@ coroutines = "1.10.2" kotlinx-serialization = "1.10.0" # Mozilla -android-components = "147.0.3" +android-components = "148.0.2" glean = "67.0.0" rust-android-gradle = "0.9.6" @@ -41,9 +41,9 @@ androidx-test-runner = "1.7.0" # Third Party Testing junit4 = "4.13.2" -junit6 = "6.0.2" -mockito = "5.21.0" -robolectric = "4.16" +junit6 = "6.0.3" +mockito = "5.23.0" +robolectric = "4.16.1" # Miscellaneous Gradle plugins gradle-download-task = "5.7.0" From 50a2f1fa319ad46e310de0048dc086e3c810ed5b Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 17 Mar 2026 15:11:51 -0400 Subject: [PATCH 3/4] Update Glean to version 67.1.0 --- gradle/libs.versions.toml | 2 +- megazords/ios-rust/Package.resolved | 4 ++-- megazords/ios-rust/Package.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f65c2baf4b..8ef4596b93 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ kotlinx-serialization = "1.10.0" # Mozilla android-components = "148.0.2" -glean = "67.0.0" +glean = "67.1.0" rust-android-gradle = "0.9.6" # AndroidX diff --git a/megazords/ios-rust/Package.resolved b/megazords/ios-rust/Package.resolved index 008c5a8c37..4431d95f27 100644 --- a/megazords/ios-rust/Package.resolved +++ b/megazords/ios-rust/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mozilla/glean-swift", "state" : { - "revision" : "e63328d4b4b2a8b103a459cd0f3828d6dc0006b2", - "version" : "66.1.0" + "revision" : "20699b0edec7dae4c2fcab77d0a3d083c73567d4", + "version" : "67.1.0" } } ], diff --git a/megazords/ios-rust/Package.swift b/megazords/ios-rust/Package.swift index e7f060f84b..c831b978e0 100644 --- a/megazords/ios-rust/Package.swift +++ b/megazords/ios-rust/Package.swift @@ -8,7 +8,7 @@ let package = Package( .library(name: "MozillaRustComponents", targets: ["MozillaRustComponentsWrapper"]), ], dependencies: [ - .package(url: "https://github.com/mozilla/glean-swift", from: "66.1.0"), + .package(url: "https://github.com/mozilla/glean-swift", from: "67.1.0"), ], targets: [ // Binary target XCFramework, contains our rust binaries and headers From a3419c50335f0b135c95bcf99909acddc9bc6668 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 17 Mar 2026 15:12:26 -0400 Subject: [PATCH 4/4] Update AndroidX Core to version 1.18.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ef4596b93..7ac0dbdfd9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ rust-android-gradle = "0.9.6" # AndroidX annotation = "1.9.1" -core = "1.17.0" +core = "1.18.0" work = "2.11.1" # JNA