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

  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

# 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.

  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

    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.

  - filename: mavenLocal.patch

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - filename: target.patch

  - filename: 40085.patch