Skip to content

Commit

Permalink
Merge branch 'release-v31.0.2' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
badboy committed May 29, 2020
2 parents 80259a4 + b3e58ba commit 74427ee
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .buildconfig.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryVersion: 31.0.1
libraryVersion: 31.0.2
groupId: org.mozilla.telemetry
projects:
glean:
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Unreleased changes

[Full changelog](https://github.com/mozilla/glean/compare/v31.0.1...master)
[Full changelog](https://github.com/mozilla/glean/compare/v31.0.2...master)

# v31.0.2 (2020-05-29)

[Full changelog](https://github.com/mozilla/glean/compare/v31.0.1...v31.0.2)

* Rust
* Fix list of included files in published crates

# v31.0.1 (2020-05-29)

Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2823,8 +2823,8 @@ THE SOFTWARE.
The following text applies to code linked from these dependencies:

* [benchmark 0.1.0]( https://crates.io/crates/benchmark )
* [glean-core 31.0.1]( https://github.com/mozilla/glean )
* [glean-ffi 31.0.1]( https://github.com/mozilla/glean )
* [glean-core 31.0.2]( https://github.com/mozilla/glean )
* [glean-ffi 31.0.2]( https://github.com/mozilla/glean )
* [glean-preview 0.0.5]( https://github.com/mozilla/glean )


Expand Down
14 changes: 7 additions & 7 deletions glean-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean-core"
version = "31.0.1"
version = "31.0.2"
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 All @@ -9,12 +9,12 @@ license = "MPL-2.0"
edition = "2018"
keywords = ["telemetry"]
include = [
"README.md",
"LICENSE",
"src/**/*",
"examples/**/*",
"tests/**/*",
"Cargo.toml"
"/README.md",
"/LICENSE",
"/src",
"/examples",
"/tests",
"/Cargo.toml"
]

[badges]
Expand Down
18 changes: 9 additions & 9 deletions glean-core/ffi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean-ffi"
version = "31.0.1"
version = "31.0.2"
authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
description = "FFI layer for Glean, a modern Telemetry library"
repository = "https://github.com/mozilla/glean"
Expand All @@ -9,13 +9,13 @@ license = "MPL-2.0"
edition = "2018"
keywords = ["telemetry"]
include = [
"README.md",
"LICENSE",
"src/**/*",
"tests/**/*",
"Cargo.toml",
"cbindgen.toml",
"glean.h"
"/README.md",
"/LICENSE",
"/src",
"/tests",
"/Cargo.toml",
"/cbindgen.toml",
"/glean.h"
]

[badges]
Expand All @@ -35,7 +35,7 @@ once_cell = "1.2.0"

[dependencies.glean-core]
path = ".."
version = "31.0.1"
version = "31.0.2"

[target.'cfg(target_os = "android")'.dependencies]
android_logger = { version = "0.8.6", default-features = false }
Expand Down
14 changes: 7 additions & 7 deletions glean-core/preview/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ license = "MPL-2.0"
edition = "2018"
keywords = ["telemetry", "glean"]
include = [
"README.md",
"LICENSE",
"CHANGELOG.md",
"src/**/*",
"tests/**/*",
"Cargo.toml",
"/README.md",
"/LICENSE",
"/CHANGELOG.md",
"/src",
"/tests",
"/Cargo.toml",
]

[badges]
Expand All @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }

[dependencies.glean-core]
path = ".."
version = "31.0.1"
version = "31.0.2"

[dependencies]
once_cell = "1.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ subprocess.check_call([
}

void apply(Project project) {
project.ext.glean_version = "31.0.1"
project.ext.glean_version = "31.0.2"

File condaDir = setupPythonEnvironmentTasks(project)
project.ext.set("gleanCondaDir", condaDir)
Expand Down

0 comments on commit 74427ee

Please sign in to comment.