Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge back release v61.0.0 #2938

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Merge back release v61.0.0 #2938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .buildconfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryVersion: 60.5.0
libraryVersion: 61.0.0
groupId: org.mozilla.telemetry
projects:
glean:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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.5.0...main)
[Full changelog](https://github.com/mozilla/glean/compare/v61.0.0...main)

# v61.0.0 (2024-08-21)

[Full changelog](https://github.com/mozilla/glean/compare/v60.5.0...v61.0.0)

* General
* BREAKING CHANGE: Updated to UniFFI 0.28.0 ([#2920](https://github.com/mozilla/glean/pull/2920))
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

29 changes: 13 additions & 16 deletions DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,6 @@ The following text applies to code linked from these dependencies:
The following text applies to code linked from these dependencies:

* [ryu 1.0.11]( https://github.com/dtolnay/ryu )
* [unicode-linebreak 0.1.5]( https://github.com/axelf4/unicode-linebreak )

```
Apache License
Expand Down Expand Up @@ -2307,10 +2306,10 @@ The following text applies to code linked from these dependencies:
* [crossbeam-utils 0.8.19]( https://github.com/crossbeam-rs/crossbeam )
* [env_logger 0.10.0]( https://github.com/rust-cli/env_logger/ )
* [fastrand 2.0.0]( https://github.com/smol-rs/fastrand )
* [flate2 1.0.26]( https://github.com/rust-lang/flate2-rs )
* [flate2 1.0.31]( https://github.com/rust-lang/flate2-rs )
* [form_urlencoded 1.1.0]( https://github.com/servo/rust-url )
* [glob 0.3.0]( https://github.com/rust-lang/glob )
* [heck 0.4.0]( https://github.com/withoutboats/heck )
* [heck 0.5.0]( https://github.com/withoutboats/heck )
* [id-arena 2.2.1]( https://github.com/fitzgen/id-arena )
* [idna 0.3.0]( https://github.com/servo/rust-url/ )
* [itoa 1.0.4]( https://github.com/dtolnay/itoa )
Expand All @@ -2334,7 +2333,6 @@ The following text applies to code linked from these dependencies:
* [unicase 2.6.0]( https://github.com/seanmonstar/unicase )
* [unicode-bidi 0.3.8]( https://github.com/servo/unicode-bidi )
* [unicode-normalization 0.1.22]( https://github.com/unicode-rs/unicode-normalization )
* [unicode-width 0.1.11]( https://github.com/unicode-rs/unicode-width )
* [url 2.3.1]( https://github.com/servo/rust-url )
* [uuid 1.4.1]( https://github.com/uuid-rs/uuid )

Expand Down Expand Up @@ -4026,7 +4024,6 @@ limitations under the License.
The following text applies to code linked from these dependencies:

* [lmdb-rkv-sys 0.11.2]( https://github.com/mozilla/lmdb-rs.git )
* [oneshot-uniffi 0.1.6]( https://github.com/faern/oneshot )
* [siphasher 0.3.10]( https://github.com/jedisct1/rust-siphash )
* [tinyvec_macros 0.1.0]( https://github.com/Soveu/tinyvec_macros )
* [winapi-x86_64-pc-windows-gnu 0.4.0]( https://github.com/retep998/winapi-rs )
Expand Down Expand Up @@ -4951,9 +4948,9 @@ SOFTWARE.

The following text applies to code linked from these dependencies:

* [glean-core 60.5.0]( https://github.com/mozilla/glean )
* [glean-build 14.5.1]( https://github.com/mozilla/glean )
* [glean 60.5.0]( https://github.com/mozilla/glean )
* [glean-core 61.0.0]( https://github.com/mozilla/glean )
* [glean-build 15.0.0]( https://github.com/mozilla/glean )
* [glean 61.0.0]( https://github.com/mozilla/glean )
* [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel )

```
Expand Down Expand Up @@ -5340,14 +5337,14 @@ The following text applies to code linked from these dependencies:
* [glean-bundle 1.0.0]( https://github.com/mozilla/glean )
* [glean-bundle-android 1.0.0]( https://github.com/mozilla/glean )
* [uniffi-bindgen 0.1.0]( https://crates.io/crates/uniffi-bindgen )
* [uniffi 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_bindgen 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_checksum_derive 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_core 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_macros 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_meta 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_testing 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi_udl 0.27.0]( https://github.com/mozilla/uniffi-rs )
* [uniffi 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_bindgen 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_checksum_derive 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_core 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_macros 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_meta 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_testing 0.28.1]( https://github.com/mozilla/uniffi-rs )
* [uniffi_udl 0.28.1]( https://github.com/mozilla/uniffi-rs )

```
Mozilla Public License Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion glean-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean-core"
version = "60.5.0"
version = "61.0.0"
authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
description = "A modern Telemetry library"
repository = "https://github.com/mozilla/glean"
Expand Down
9 changes: 0 additions & 9 deletions glean-core/android-native/dependency-licenses.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: ryu</name>
<url>https://github.com/dtolnay/ryu</url>
</license> <license>
<name>Apache License 2.0: unicode-linebreak</name>
<url>https://github.com/axelf4/unicode-linebreak</url>
</license> <license>
<name>Apache License 2.0: winapi</name>
<url>https://github.com/retep998/winapi-rs</url>
Expand Down Expand Up @@ -195,9 +192,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: unicode-normalization</name>
<url>https://github.com/unicode-rs/unicode-normalization</url>
</license> <license>
<name>Apache License 2.0: unicode-width</name>
<url>https://github.com/unicode-rs/unicode-width</url>
</license> <license>
<name>Apache License 2.0: url</name>
<url>https://github.com/servo/rust-url</url>
Expand Down Expand Up @@ -231,9 +225,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: lmdb-rkv-sys</name>
<url>https://github.com/mozilla/lmdb-rs.git</url>
</license> <license>
<name>Apache License 2.0: oneshot-uniffi</name>
<url>https://github.com/faern/oneshot</url>
</license> <license>
<name>Apache License 2.0: siphasher</name>
<url>https://github.com/jedisct1/rust-siphash</url>
Expand Down
9 changes: 0 additions & 9 deletions glean-core/android/dependency-licenses.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: ryu</name>
<url>https://github.com/dtolnay/ryu</url>
</license> <license>
<name>Apache License 2.0: unicode-linebreak</name>
<url>https://github.com/axelf4/unicode-linebreak</url>
</license> <license>
<name>Apache License 2.0: winapi</name>
<url>https://github.com/retep998/winapi-rs</url>
Expand Down Expand Up @@ -195,9 +192,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: unicode-normalization</name>
<url>https://github.com/unicode-rs/unicode-normalization</url>
</license> <license>
<name>Apache License 2.0: unicode-width</name>
<url>https://github.com/unicode-rs/unicode-width</url>
</license> <license>
<name>Apache License 2.0: url</name>
<url>https://github.com/servo/rust-url</url>
Expand Down Expand Up @@ -231,9 +225,6 @@ the details of which are reproduced below.
</license> <license>
<name>Apache License 2.0: lmdb-rkv-sys</name>
<url>https://github.com/mozilla/lmdb-rs.git</url>
</license> <license>
<name>Apache License 2.0: oneshot-uniffi</name>
<url>https://github.com/faern/oneshot</url>
</license> <license>
<name>Apache License 2.0: siphasher</name>
<url>https://github.com/jedisct1/rust-siphash</url>
Expand Down
4 changes: 2 additions & 2 deletions glean-core/rlb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean"
version = "60.5.0"
version = "61.0.0"
authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
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.5.0"
version = "61.0.0"

[dependencies]
inherent = "1"
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy
View file
Open in desktop
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.5.0"
project.ext.glean_version = "61.0.0"
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
View file
Open in desktop
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.5.0"
version = "61.0.0"
requires-python = ">=3.8"
classifiers = [
"Intended Audience :: Developers",
Expand Down
Loading