Skip to content

Commit

Permalink
Upgrade to glean_parser 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
badboy committed Jan 24, 2023
1 parent 40740b0 commit c08ca0f
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

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

* General
* Upgrade to `glean_parser` v7.0.0 ([#2346](https://github.com/mozilla/glean/pull/2346))

# v52.0.1 (2023-01-19)

[Full changelog](https://github.com/mozilla/glean/compare/v52.0.0...v52.0.1)
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ docs-python: build-python ## Build the Python documentation
.PHONY: docs rust-docs swift-docs

docs-metrics: setup-python ## Build the internal metrics documentation
$(GLEAN_PYENV)/bin/pip install glean_parser~=6.4
$(GLEAN_PYENV)/bin/pip install glean_parser~=7.0
$(GLEAN_PYENV)/bin/glean_parser translate --allow-reserved \
-f markdown \
-o ./docs/user/user/collected-metrics \
Expand Down
2 changes: 1 addition & 1 deletion glean-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include = [
rust-version = "1.58"

[package.metadata.glean]
glean-parser = "6.4.0"
glean-parser = "7.0.0"

[badges]
circle-ci = { repository = "mozilla/glean", branch = "main" }
Expand Down
2 changes: 1 addition & 1 deletion glean-core/build/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glean-build"
version = "6.4.0"
version = "7.0.0"
edition = "2021"
description = "Glean SDK Rust build helper"
repository = "https://github.com/mozilla/glean"
Expand Down
2 changes: 1 addition & 1 deletion glean-core/build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use std::env;

use xshell_venv::{Result, Shell, VirtualEnv};

const GLEAN_PARSER_VERSION: &str = "6.4.0";
const GLEAN_PARSER_VERSION: &str = "7.0.0";

/// A Glean Rust bindings generator.
pub struct Builder {
Expand Down
2 changes: 1 addition & 1 deletion glean-core/ios/sdk_generator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

set -e

GLEAN_PARSER_VERSION=6.4
GLEAN_PARSER_VERSION=7.0

# CMDNAME is used in the usage text below.
# shellcheck disable=SC2034
Expand Down
2 changes: 1 addition & 1 deletion glean-core/python/glean/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
__email__ = "glean-team@mozilla.com"


GLEAN_PARSER_VERSION = "6.4.0"
GLEAN_PARSER_VERSION = "7.0.0"
parser_version = VersionInfo.parse(GLEAN_PARSER_VERSION)
parser_version_next_major = parser_version.bump_major()

Expand Down
2 changes: 1 addition & 1 deletion glean-core/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

requirements = [
"semver>=2.13.0",
"glean_parser~=6.4",
"glean_parser~=7.0",
]

# The environment variable `GLEAN_BUILD_VARIANT` can be set to `debug` or `release`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class GleanMetricsYamlTransform extends ArtifactTransform {
@SuppressWarnings("GrPackage")
class GleanPlugin implements Plugin<Project> {
// The version of glean_parser to install from PyPI.
private String GLEAN_PARSER_VERSION = "6.4"
private String GLEAN_PARSER_VERSION = "7.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"
Expand Down

0 comments on commit c08ca0f

Please sign in to comment.