Skip to content

Commit

Permalink
Bumped version to 60.1.1
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
badboy committed May 31, 2024
1 parent 8515e27 commit 7ed4b04
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .buildconfig.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryVersion: 60.1.0
libraryVersion: 60.1.1
groupId: org.mozilla.telemetry
projects:
glean:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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 )

```
Expand Down
2 changes: 1 addition & 1 deletion glean-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean-core"
version = "60.1.0"
version = "60.1.1"
authors = ["Jan-Erik Rediger <[email protected]>", "The Glean Team <[email protected]>"]
description = "A modern Telemetry library"
repository = "https://github.com/mozilla/glean"
Expand Down
27 changes: 12 additions & 15 deletions glean-core/android-native/dependency-licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: env_logger</name>
<url>https://github.com/rust-cli/env_logger/</url>
</license> <license>
<name>Apache License 2.0: errno</name>
<url>https://github.com/lambda-fairy/rust-errno</url>
</license> <license>
<name>Apache License 2.0: fastrand</name>
<url>https://github.com/smol-rs/fastrand</url>
Expand Down Expand Up @@ -312,6 +309,18 @@ the details of which are reproduced below.
</license> <license>
<name>MIT License: bincode</name>
<url>https://github.com/servo/bincode</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-core</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-build</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: zeitstempel</name>
<url>https://github.com/badboy/zeitstempel</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-bundle</name>
<url>https://github.com/mozilla/glean</url>
Expand Down Expand Up @@ -345,18 +354,6 @@ the details of which are reproduced below.
</license> <license>
<name>Mozilla Public License 2.0: uniffi_udl</name>
<url>https://github.com/mozilla/uniffi-rs</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-core</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-build</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: zeitstempel</name>
<url>https://github.com/badboy/zeitstempel</url>
</license> <license>
<name>Unicode License Agreement - Data Files and Software (2016): unicode-ident</name>
<url>https://github.com/dtolnay/unicode-ident</url>
Expand Down
27 changes: 12 additions & 15 deletions glean-core/android/dependency-licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: env_logger</name>
<url>https://github.com/rust-cli/env_logger/</url>
</license> <license>
<name>Apache License 2.0: errno</name>
<url>https://github.com/lambda-fairy/rust-errno</url>
</license> <license>
<name>Apache License 2.0: fastrand</name>
<url>https://github.com/smol-rs/fastrand</url>
Expand Down Expand Up @@ -312,6 +309,18 @@ the details of which are reproduced below.
</license> <license>
<name>MIT License: bincode</name>
<url>https://github.com/servo/bincode</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-core</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-build</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: zeitstempel</name>
<url>https://github.com/badboy/zeitstempel</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-bundle</name>
<url>https://github.com/mozilla/glean</url>
Expand Down Expand Up @@ -345,18 +354,6 @@ the details of which are reproduced below.
</license> <license>
<name>Mozilla Public License 2.0: uniffi_udl</name>
<url>https://github.com/mozilla/uniffi-rs</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-core</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean-build</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: glean</name>
<url>https://github.com/mozilla/glean</url>
</license> <license>
<name>Mozilla Public License 2.0: zeitstempel</name>
<url>https://github.com/badboy/zeitstempel</url>
</license> <license>
<name>Unicode License Agreement - Data Files and Software (2016): unicode-ident</name>
<url>https://github.com/dtolnay/unicode-ident</url>
Expand Down
4 changes: 2 additions & 2 deletions glean-core/rlb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean"
version = "60.1.0"
version = "60.1.1"
authors = ["Jan-Erik Rediger <[email protected]>", "The Glean Team <[email protected]>"]
description = "Glean SDK Rust language bindings"
repository = "https://github.com/mozilla/glean"
Expand All @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }

[dependencies.glean-core]
path = ".."
version = "60.1.0"
version = "=60.1.1"

[dependencies]
inherent = "1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 7ed4b04

Please sign in to comment.