From 5e5f03257c89b9b18d82cbf6d31afba9c017b8d5 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Thu, 19 May 2022 12:05:10 +0200 Subject: [PATCH] Upgrade glean_parser to v6 --- Makefile | 2 +- glean-core/Cargo.toml | 2 +- glean-core/android/build.gradle | 1 - glean-core/ios/Glean/Glean.swift | 2 -- glean-core/ios/sdk_generator.sh | 2 +- glean-core/python/glean/__init__.py | 2 +- glean-core/python/setup.py | 2 +- .../telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy | 2 +- samples/android/app/build.gradle | 1 - samples/ios/app/glean-sample-app/AppDelegate.swift | 2 +- 10 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 2876fbba0..dbced0ccd 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ python-docs: build-python ## Build the Python documentation .PHONY: docs rust-docs swift-docs metrics-docs: python-setup ## Build the internal metrics documentation - $(GLEAN_PYENV)/bin/pip install glean_parser==5.0.1 + $(GLEAN_PYENV)/bin/pip install glean_parser==6.0.0 $(GLEAN_PYENV)/bin/glean_parser translate --allow-reserved \ -f markdown \ -o ./docs/user/user/collected-metrics \ diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index f06c07f5a..7daad8d59 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -20,7 +20,7 @@ include = [ ] [package.metadata.glean] -glean-parser = "5.0.1" +glean-parser = "6.0.0" [badges] circle-ci = { repository = "mozilla/glean", branch = "main" } diff --git a/glean-core/android/build.gradle b/glean-core/android/build.gradle index 6d1e3c5a5..f36a05661 100644 --- a/glean-core/android/build.gradle +++ b/glean-core/android/build.gradle @@ -26,7 +26,6 @@ File GLEAN_PING_SCHEMA_PATH = file("$rootDir/glean.1.schema.json") // Set configuration for the glean_parser ext.allowGleanInternal = true ext.gleanNamespace = "mozilla.telemetry.glean" -ext.gleanParserOverride = "git+https://github.com/badboy/glean_parser@uniffi-preparation#glean-parser" android { compileSdkVersion rootProject.ext.build.compileSdkVersion diff --git a/glean-core/ios/Glean/Glean.swift b/glean-core/ios/Glean/Glean.swift index 98b2961a8..cba580532 100644 --- a/glean-core/ios/Glean/Glean.swift +++ b/glean-core/ios/Glean/Glean.swift @@ -289,8 +289,6 @@ public class Glean { /// return `false`. /// If Glean is not initialized yet, tags will not be validated at this point. /// - /// This is only meant to be used internally by the `GleanDebugActivity`. - /// /// - parameters: /// * tags: A list of tags, which must be valid HTTP header values. public func setSourceTags(_ tags: [String]) -> Bool { diff --git a/glean-core/ios/sdk_generator.sh b/glean-core/ios/sdk_generator.sh index 090a02634..afd56a6e9 100755 --- a/glean-core/ios/sdk_generator.sh +++ b/glean-core/ios/sdk_generator.sh @@ -25,7 +25,7 @@ set -e -GLEAN_PARSER_VERSION=5.0.1 +GLEAN_PARSER_VERSION=6.0.0 # CMDNAME is used in the usage text below. # shellcheck disable=SC2034 diff --git a/glean-core/python/glean/__init__.py b/glean-core/python/glean/__init__.py index e19579331..1818fbe47 100644 --- a/glean-core/python/glean/__init__.py +++ b/glean-core/python/glean/__init__.py @@ -30,7 +30,7 @@ __author__ = "The Glean Team" __email__ = "glean-team@mozilla.com" -GLEAN_PARSER_VERSION = "5.0.1" +GLEAN_PARSER_VERSION = "6.0.0" if glean_parser.__version__ != GLEAN_PARSER_VERSION: diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py index 2cf10648f..4855e9907 100644 --- a/glean-core/python/setup.py +++ b/glean-core/python/setup.py @@ -60,7 +60,7 @@ version = "44.2.0" requirements = [ "cffi>=1.13.0", - "glean_parser==5.0.1", + "glean_parser==6.0.0", ] setup_requirements = ["cffi>=1.13.0"] 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 index b96cce597..5eda15179 100644 --- 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 @@ -41,7 +41,7 @@ class GleanMetricsYamlTransform extends ArtifactTransform { @SuppressWarnings("GrPackage") class GleanPlugin implements Plugin { // The version of glean_parser to install from PyPI. - private String GLEAN_PARSER_VERSION = "5.0.1" + private String GLEAN_PARSER_VERSION = "6.0.0" // The version of Miniconda is explicitly specified. // Miniconda3-4.5.12 is known to not work on Windows. private String MINICONDA_VERSION = "4.5.11" diff --git a/samples/android/app/build.gradle b/samples/android/app/build.gradle index b59f53e64..c5a10f2e3 100644 --- a/samples/android/app/build.gradle +++ b/samples/android/app/build.gradle @@ -65,7 +65,6 @@ ext.gleanBuildDate = "2020-11-06T11:30:50+00:00" // Enable expiration by major version. The sample is at version 1, // see versionName. ext.gleanExpireByVersion = 1 -ext.gleanParserOverride = "git+https://github.com/badboy/glean_parser@uniffi-preparation#glean-parser" // Include the glean-gradle-plugin. This is slightly different than what is // recommended for external users since we are loading it from the same root Gradle diff --git a/samples/ios/app/glean-sample-app/AppDelegate.swift b/samples/ios/app/glean-sample-app/AppDelegate.swift index c0b2acf98..f3501abba 100644 --- a/samples/ios/app/glean-sample-app/AppDelegate.swift +++ b/samples/ios/app/glean-sample-app/AppDelegate.swift @@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { print("using a mock server, setting address: \(address)") let cfg = Configuration(serverEndpoint: address) - glean.setSourceTags(["automation"]) + _ = glean.setSourceTags(["automation"]) glean.initialize(uploadEnabled: true, configuration: cfg, buildInfo: GleanMetrics.GleanBuild.info) } else { print("using default config for Glean")