Merge back release of v50.1.1 (#2100)

mozilla · Jun 17, 2022 · c9235d3 · c9235d3
1 parent 721cfa5
commit c9235d3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 50.1.0
+libraryVersion: 50.1.1
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v50.1.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v50.1.1...main)
+
+# v50.1.1 (2022-06-17)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v50.1.0...v50.1.1)
 
 * Kotlin
   * Fix bug in Glean Gradle plugin by using correct quoting in embedded Python script ([#2097](https://github.com/mozilla/glean/pull/2097))

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -441,7 +441,7 @@ limitations under the License.
 
 The following text applies to code linked from these dependencies:
 
-* [android_logger 0.10.1]( https://github.com/Nercury/android_logger-rs )
+* [android_logger 0.11.0]( https://github.com/Nercury/android_logger-rs )
 
 
 ```
@@ -659,7 +659,7 @@ The following text applies to code linked from these dependencies:
 * [cfg-if 1.0.0]( https://github.com/alexcrichton/cfg-if )
 * [crossbeam-channel 0.5.4]( https://github.com/crossbeam-rs/crossbeam )
 * [crossbeam-utils 0.8.8]( https://github.com/crossbeam-rs/crossbeam )
-* [env_logger 0.8.4]( https://github.com/env-logger-rs/env_logger/ )
+* [env_logger 0.9.0]( https://github.com/env-logger-rs/env_logger/ )
 * [ffi-support 0.4.4]( https://github.com/mozilla/ffi-support )
 * [flate2 1.0.24]( https://github.com/rust-lang/flate2-rs )
 * [form_urlencoded 1.0.1]( https://github.com/servo/rust-url )
@@ -4900,8 +4900,8 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 The following text applies to code linked from these dependencies:
 
-* [glean 50.1.0]( https://github.com/mozilla/glean )
-* [glean-core 50.1.0]( https://github.com/mozilla/glean )
+* [glean 50.1.1]( https://github.com/mozilla/glean )
+* [glean-core 50.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
@@ -1,6 +1,6 @@
 [package]
 name = "glean-core"
-version = "50.1.0"
+version = "50.1.1"
 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"

diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py
@@ -56,7 +56,7 @@
     history = history_file.read()
 
 # glean version. Automatically updated by the bin/prepare_release.sh script
-version = "50.1.0"
+version = "50.1.1"
 
 requirements = [
     "cffi>=1.13.0",

diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "glean"
-version = "50.1.0"
+version = "50.1.1"
 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"
@@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies.glean-core]
 path = ".."
-version = "50.1.0"
+version = "50.1.1"
 
 [dependencies]
 crossbeam-channel = "0.5"

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
@@ -529,7 +529,7 @@ except:
     void apply(Project project) {
         isOffline = project.gradle.startParameter.offline
 
-        project.ext.glean_version = "50.1.0"
+        project.ext.glean_version = "50.1.1"
         def parserVersion = gleanParserVersion(project)
 
         // Print the required glean_parser version to the console. This is