Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
android-gradle-plugin = "8.13.2"

# Google
protobuf = "4.33.2"
protobuf = "4.34.1"
protobuf-plugin = "0.9.6"

# Kotlin
kotlin = "2.3.10"
kotlin = "2.3.20"
coroutines = "1.10.2"
kotlinx-serialization = "1.10.0"

# Mozilla
android-components = "147.0.3"
glean = "67.0.0"
android-components = "148.0.2"
glean = "67.1.0"
rust-android-gradle = "0.9.6"

# AndroidX
annotation = "1.9.1"
core = "1.17.0"
core = "1.18.0"
work = "2.11.1"

# JNA
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libs/verify-android-ci-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions megazords/ios-rust/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion megazords/ios-rust/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down