Merge branch 'release-v52.1.1' into release

.buildconfig.yml

@@ -1,4 +1,4 @@
-libraryVersion: 52.1.0
+libraryVersion: 52.1.1
 groupId: org.mozilla.telemetry
 projects:
   glean:

.dictionary

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 254 utf-8
+personal_ws-1.1 en 255 utf-8
 AAR
 AARs
 ABI
@@ -249,6 +249,7 @@ vendored
 vendoring
 webextension
 webpages
+whatsys
 xcframework
 xcpretty
 yaml

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v52.1.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v52.1.1...main)
+
+# v52.1.1 (2023-01-26)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v52.1.0...v52.1.1)
+
+* General
+  * BUGFIX: Properly invoke the windows build number function from whatsys ([bug 1812672](https://bugzilla.mozilla.org/show_bug.cgi?id=1812672)) 
 
 # v52.1.0 (2023-01-26)
 

docs/user/reference/metrics/datetime.md

@@ -22,7 +22,7 @@ Sets a datetime metric to a specific date value. Defaults to now.
 import org.mozilla.yourApplication.GleanMetrics.Install
 
 Install.firstRun.set() // Records "now"
-Install.firstRun.set(Calendar(2019, 3, 25)) // Records a custom datetime
+Install.firstRun.set(Date(2019, 3, 25)) // Records a custom datetime
 ```
 
 </div>
@@ -33,7 +33,7 @@ Install.firstRun.set(Calendar(2019, 3, 25)) // Records a custom datetime
 import org.mozilla.yourApplication.GleanMetrics.Install;
 
 Install.INSTANCE.firstRun().set(); // Records "now"
-Install.INSTANCE.firstRun().set(Calendar(2019, 3, 25)); // Records a custom datetime
+Install.INSTANCE.firstRun().set(new Date(2019, 3, 25)); // Records a custom datetime
 ```
 
 </div>

glean-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glean-core"
-version = "52.1.0"
+version = "52.1.1"
 authors = ["Jan-Erik Rediger <[email protected]>", "The Glean Team <[email protected]>"]
 description = "A modern Telemetry library"
 repository = "https://github.com/mozilla/glean"

glean-core/android-native/dependency-licenses.xml

@@ -297,18 +297,6 @@ the details of which are reproduced below.
   </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</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-core</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: embedded-uniffi-bindgen</name>
     <url>https://crates.io/crates/embedded-uniffi-bindgen</url>
@@ -339,6 +327,18 @@ the details of which are reproduced below.
   </license>  <license>
     <name>Mozilla Public License 2.0: uniffi_testing</name>
     <url>https://github.com/mozilla/uniffi-rs</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: glean-build</name>
+    <url>https://github.com/mozilla/glean</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: 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>

glean-core/android/dependency-licenses.xml

@@ -297,18 +297,6 @@ the details of which are reproduced below.
   </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</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-core</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: embedded-uniffi-bindgen</name>
     <url>https://crates.io/crates/embedded-uniffi-bindgen</url>
@@ -339,6 +327,18 @@ the details of which are reproduced below.
   </license>  <license>
     <name>Mozilla Public License 2.0: uniffi_testing</name>
     <url>https://github.com/mozilla/uniffi-rs</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: glean-build</name>
+    <url>https://github.com/mozilla/glean</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: 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>

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 = "52.1.0"
+version = "52.1.1"
 
 requirements = [
     "semver>=2.13.0",

glean-core/rlb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glean"
-version = "52.1.0"
+version = "52.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"
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies.glean-core]
 path = ".."
-version = "52.1.0"
+version = "52.1.1"
 
 [dependencies]
 crossbeam-channel = "0.5"

glean-core/rlb/src/system.rs

@@ -76,7 +76,7 @@ pub fn get_os_version() -> String {
 #[cfg(target_os = "windows")]
 /// Returns the Windows build number, e.g. 22000
 pub fn get_windows_build_number() -> Option<i64> {
-    match whatsys::get_windows_build_number() {
+    match whatsys::windows_build_number() {
         // Cast to i64 to work with QuantityMetric type
         Some(i) => Some(i as i64),
         _ => None,

gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy

@@ -555,7 +555,7 @@ except:
     void apply(Project project) {
         isOffline = project.gradle.startParameter.offline
 
-        project.ext.glean_version = "52.1.0"
+        project.ext.glean_version = "52.1.1"
         def parserVersion = gleanParserVersion(project)
 
         // Print the required glean_parser version to the console. This is