From 7ed4b0457f8c6fde5c77d98684af2a6a1b1d14b8 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Fri, 31 May 2024 13:16:24 +0200 Subject: [PATCH] Bumped version to 60.1.1 RLB: Fixed glean-core dependency Because we renamed an otherwise internal function we need to make this a strict version requirement. That's fine because noone should ever use differing versions of glean and glean-core (and we tightly control the rollout of this patch version) --- .buildconfig.yml | 2 +- CHANGELOG.md | 6 ++++- Cargo.lock | 4 +-- DEPENDENCIES.md | 5 ++-- glean-core/Cargo.toml | 2 +- .../android-native/dependency-licenses.xml | 27 +++++++++---------- glean-core/android/dependency-licenses.xml | 27 +++++++++---------- glean-core/rlb/Cargo.toml | 4 +-- .../GleanGradlePlugin.groovy | 2 +- pyproject.toml | 2 +- 10 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index c2ad648c73..27b3f35e0d 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 60.1.0 +libraryVersion: 60.1.1 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1441df1c80..efd8742071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v60.1.0...main) +[Full changelog](https://github.com/mozilla/glean/compare/v60.1.1...main) + +# v60.1.1 (2024-05-31) + +[Full changelog](https://github.com/mozilla/glean/compare/v60.1.0...v60.1.1) * Android * Allow configuring `delayPingLifetimeIo` in Kotlin and auto-flush this data after 1000 writes. diff --git a/Cargo.lock b/Cargo.lock index fa74402f28..71c17396f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ [[package]] name = "glean" -version = "60.1.0" +version = "60.1.1" dependencies = [ "crossbeam-channel", "env_logger", @@ -359,7 +359,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "60.1.0" +version = "60.1.1" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 10d2bef4bd..09eaafda65 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -2306,7 +2306,6 @@ The following text applies to code linked from these dependencies: * [crossbeam-channel 0.5.12]( https://github.com/crossbeam-rs/crossbeam ) * [crossbeam-utils 0.8.19]( https://github.com/crossbeam-rs/crossbeam ) * [env_logger 0.10.0]( https://github.com/rust-cli/env_logger/ ) -* [errno 0.3.3]( https://github.com/lambda-fairy/rust-errno ) * [fastrand 2.0.0]( https://github.com/smol-rs/fastrand ) * [flate2 1.0.26]( https://github.com/rust-lang/flate2-rs ) * [form_urlencoded 1.1.0]( https://github.com/servo/rust-url ) @@ -4952,9 +4951,9 @@ SOFTWARE. The following text applies to code linked from these dependencies: -* [glean-core 60.1.0]( https://github.com/mozilla/glean ) +* [glean-core 60.1.1]( https://github.com/mozilla/glean ) * [glean-build 14.0.1]( https://github.com/mozilla/glean ) -* [glean 60.1.0]( https://github.com/mozilla/glean ) +* [glean 60.1.1]( https://github.com/mozilla/glean ) * [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel ) ``` diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index d0e5a00e58..e7bb82dad3 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "60.1.0" +version = "60.1.1" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "A modern Telemetry library" repository = "https://github.com/mozilla/glean" diff --git a/glean-core/android-native/dependency-licenses.xml b/glean-core/android-native/dependency-licenses.xml index 2ca583da38..b305e07894 100644 --- a/glean-core/android-native/dependency-licenses.xml +++ b/glean-core/android-native/dependency-licenses.xml @@ -111,9 +111,6 @@ the details of which are reproduced below. Apache License 2.0: env_logger https://github.com/rust-cli/env_logger/ - - Apache License 2.0: errno - https://github.com/lambda-fairy/rust-errno Apache License 2.0: fastrand https://github.com/smol-rs/fastrand @@ -312,6 +309,18 @@ the details of which are reproduced below. MIT License: bincode https://github.com/servo/bincode + + Mozilla Public License 2.0: glean-core + https://github.com/mozilla/glean + + Mozilla Public License 2.0: glean-build + https://github.com/mozilla/glean + + Mozilla Public License 2.0: glean + https://github.com/mozilla/glean + + Mozilla Public License 2.0: zeitstempel + https://github.com/badboy/zeitstempel Mozilla Public License 2.0: glean-bundle https://github.com/mozilla/glean @@ -345,18 +354,6 @@ the details of which are reproduced below. Mozilla Public License 2.0: uniffi_udl https://github.com/mozilla/uniffi-rs - - Mozilla Public License 2.0: glean-core - https://github.com/mozilla/glean - - Mozilla Public License 2.0: glean-build - https://github.com/mozilla/glean - - Mozilla Public License 2.0: glean - https://github.com/mozilla/glean - - Mozilla Public License 2.0: zeitstempel - https://github.com/badboy/zeitstempel Unicode License Agreement - Data Files and Software (2016): unicode-ident https://github.com/dtolnay/unicode-ident diff --git a/glean-core/android/dependency-licenses.xml b/glean-core/android/dependency-licenses.xml index 2ca583da38..b305e07894 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -111,9 +111,6 @@ the details of which are reproduced below. Apache License 2.0: env_logger https://github.com/rust-cli/env_logger/ - - Apache License 2.0: errno - https://github.com/lambda-fairy/rust-errno Apache License 2.0: fastrand https://github.com/smol-rs/fastrand @@ -312,6 +309,18 @@ the details of which are reproduced below. MIT License: bincode https://github.com/servo/bincode + + Mozilla Public License 2.0: glean-core + https://github.com/mozilla/glean + + Mozilla Public License 2.0: glean-build + https://github.com/mozilla/glean + + Mozilla Public License 2.0: glean + https://github.com/mozilla/glean + + Mozilla Public License 2.0: zeitstempel + https://github.com/badboy/zeitstempel Mozilla Public License 2.0: glean-bundle https://github.com/mozilla/glean @@ -345,18 +354,6 @@ the details of which are reproduced below. Mozilla Public License 2.0: uniffi_udl https://github.com/mozilla/uniffi-rs - - Mozilla Public License 2.0: glean-core - https://github.com/mozilla/glean - - Mozilla Public License 2.0: glean-build - https://github.com/mozilla/glean - - Mozilla Public License 2.0: glean - https://github.com/mozilla/glean - - Mozilla Public License 2.0: zeitstempel - https://github.com/badboy/zeitstempel Unicode License Agreement - Data Files and Software (2016): unicode-ident https://github.com/dtolnay/unicode-ident diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index bdd22550b5..87b5a3f290 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "60.1.0" +version = "60.1.1" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "60.1.0" +version = "=60.1.1" [dependencies] inherent = "1" diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy index fd6d55345d..1f1d9dc2c0 100644 --- a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy +++ b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy @@ -552,7 +552,7 @@ except: void apply(Project project) { isOffline = project.gradle.startParameter.offline - project.ext.glean_version = "60.1.0" + project.ext.glean_version = "60.1.1" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is diff --git a/pyproject.toml b/pyproject.toml index 169f393227..722652aadf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "glean-sdk" -version = "60.1.0" +version = "60.1.1" requires-python = ">=3.8" classifiers = [ "Intended Audience :: Developers",