From 319da938b8b9d70ced242fa2eb4742c189f7efd1 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Fri, 18 Sep 2020 13:21:33 +0200 Subject: [PATCH] Upgrade Glean to v32.4.0 Glean changelog: * General * Allow using quantity metric type outside of Gecko ([#1198](https://github.com/mozilla/glean/pull/1198)) * Update `glean_parser` to 1.28.5 * The `SUPERFLUOUS_NO_LINT` warning has been removed from the glinter. It likely did more harm than good, and makes it hard to make metrics.yaml files that pass across different versions of `glean_parser`. * Expired metrics will now produce a linter warning, `EXPIRED_METRIC`. * Expiry dates that are more than 730 days (~2 years) in the future will produce a linter warning, `EXPIRATION_DATE_TOO_FAR`. * Allow using the Quantity metric type outside of Gecko. * New parser configs `custom_is_expired` and `custom_validate_expires` added. These are both functions that take the expires value of the metric and return a bool. (See `Metric.is_expired` and `Metric.validate_expires`). These will allow FOG to provide custom validation for its version-based `expires` values. * Add a limit of 250 pending ping files. ([#1217](https://github.com/mozilla/glean/pull/1217)). Note: This also gets rid of the 2 workarounds (removed code) in AppService thanks to upstream changes. --- components/glean | 2 +- .../logins/ios/Logins/Extensions/String+Free_Logins.swift | 8 -------- megazords/ios/MozillaAppServices.h | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/components/glean b/components/glean index 38e12288be..9c55b4ccd3 160000 --- a/components/glean +++ b/components/glean @@ -1 +1 @@ -Subproject commit 38e12288bebf4108774ccef1154f8f0d7dd37098 +Subproject commit 9c55b4ccd355ecebb01e04421f5aa73b04512de2 diff --git a/components/logins/ios/Logins/Extensions/String+Free_Logins.swift b/components/logins/ios/Logins/Extensions/String+Free_Logins.swift index d838ead44f..4a7ca36b61 100644 --- a/components/logins/ios/Logins/Extensions/String+Free_Logins.swift +++ b/components/logins/ios/Logins/Extensions/String+Free_Logins.swift @@ -4,17 +4,9 @@ import Foundation -/* - * NOTE: This is now provided by Glean. - * Because it's all compiled into a single libmegazord.a it doesn't matter which `destroy_string` we call, - * internally it defers to the same string implementation. - * Because Glean is added as a submodule it's easier to change this occurence than it it to change the one of Glean. - */ -/* extension String { public init(freeingRustString rustString: UnsafeMutablePointer) { defer { sync15_passwords_destroy_string(rustString) } self.init(cString: rustString) } } - */ diff --git a/megazords/ios/MozillaAppServices.h b/megazords/ios/MozillaAppServices.h index a98909fa0e..543dafe045 100644 --- a/megazords/ios/MozillaAppServices.h +++ b/megazords/ios/MozillaAppServices.h @@ -7,14 +7,6 @@ FOUNDATION_EXPORT double MegazordClientVersionNumber; FOUNDATION_EXPORT const unsigned char MegazordClientVersionString[]; -/** - * FIXME: Glean has a `getGleanVersion` function that uses this constant. - * That function is not actually used (and the version wrong anyway). - * Because Glean is added as a submodule it's easier to change this occurence than it it to change the one of Glean, - * for now. - */ -static double GleanVersionNumber = 0.0; - #import "RustFxAFFI.h" #import "RustPasswordAPI.h" #import "RustLogFFI.h"