Unverified Commit 4aebd17f authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40121: Use updated glean_parser for application-services as well

parent 8efcab70
......@@ -15,8 +15,6 @@ var:
gradle_dependencies_version: 6
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
# Overwrite `glean_parser` for now to fix #40085.
glean_parser: 1.28.6
targets:
nightly:
......
From bca7900361a57278293444fdf0855240987ebb49 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Fri, 9 Oct 2020 13:35:24 +0000
Subject: [PATCH] Bug 40085: Bump glean_parser to 1.28.6
diff --git a/build.gradle b/build.gradle
index c6e0be82..2a13739c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
ext.kotlin_version = '1.3.71'
ext.jna_version = '5.2.0'
ext.android_gradle_plugin_version = '3.6.0'
- ext.android_components_version = '56.0.0'
+ ext.android_components_version = '62.0.0'
ext.build = [
ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile.
--
2.28.0
......@@ -82,6 +82,9 @@ patch -p1 < $rootdir/no-git.patch
# XXX: We don't build the code for Linux for now as this involves additional
# complexity. That's needed for running unit tests later on, though.
patch -p1 < $rootdir/target.patch
# We need to pick up a newer glean_parser until an updated glean is used by
# application-services.
patch -p1 < $rootdir/40085.patch
[% IF c('var/fetch_gradle_dependencies') %]
# XXX: `assemble` is still not enough to see all fetched dependencies via
# Gradle's --debug. See: tor-browser-build#40056.
......
......@@ -8,7 +8,7 @@ var:
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 2
gradle_dependencies_version: 3
# This should be updated when the list of rust dependencies is changed.
rust_vendor_version: 2
# For armv7 we need a different target than the default one we use for
......@@ -80,7 +80,7 @@ input_files:
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2
sha256sum: 69234aa1ae38fd5dda4de71bd5e536795073703c3ed5bb994b9b8485bd7a55dc
sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4
enable: '[% !c("var/fetch_gradle_dependencies") %]'
# `cargo vendor vendor` in the `application-services` directory has vendored
# the sources.
......@@ -90,3 +90,4 @@ input_files:
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch
- filename: 40085.patch
......@@ -17,8 +17,6 @@ var:
gradle_dependencies_version: 8
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
# Overwrite `glean_parser` for now to fix #40085.
glean_parser: 1.28.6
targets:
nightly:
......
......@@ -287,7 +287,7 @@ targets:
android_min_api_x86_64: 21
android_min_api_aarch64: 21
# This is needed to get the offline build part for Glean right.
glean_parser: 1.28.1
glean_parser: 1.28.6
# We only build snowflake on the alpha and nightly
# channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment