From fe8a8bfb0a13e655860267fe684ba353ca15fd3b Mon Sep 17 00:00:00 2001 From: Jonathan Almeida Date: Wed, 18 Sep 2019 10:15:29 -0400 Subject: [PATCH] No issue: Add Digital Asset Links token for TWAs --- .gitignore | 1 + app/build.gradle | 15 +++++++++++++++ automation/taskcluster/lib/tasks.py | 2 ++ 3 files changed, 18 insertions(+) diff --git a/.gitignore b/.gitignore index 2cd257f9c..8d93c55d7 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ gen-external-apklibs # Token files .leanplum_token .adjust_token +.digital_asset_links_token # Python Byte-compiled / optimized / DLL files diff --git a/app/build.gradle b/app/build.gradle index 11f5774be..4a64b7416 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -315,6 +315,21 @@ android.applicationVariants.all { variant -> buildConfigField 'String', 'LEANPLUM_TOKEN', 'null' println("X_X") } + +// ------------------------------------------------------------------------------------------------- +// Digital Asset Links: Read token from local file if it exists +// ------------------------------------------------------------------------------------------------- + + print("Digital Asset Links token: ") + + try { + def token = new File("${rootDir}/.digital_asset_links_token").text.trim() + buildConfigField 'String', 'DIGITAL_ASSET_LINKS_TOKEN', '"' + token + '"' + println "(Added from .digital_asset_links_token file)" + } catch (FileNotFoundException ignored) { + buildConfigField 'String', 'DIGITAL_ASSET_LINKS_TOKEN', 'null' + println("X_X") + } } androidExtensions { diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index 0e2572d31..acb05163e 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -61,6 +61,7 @@ class TaskBuilder(object): ('sentry_dsn', '.sentry_token'), ('leanplum', '.leanplum_token'), ('adjust', '.adjust_token'), + ('digital_asset_links', '.digital_asset_links_token'), ('firebase', 'app/src/{}/res/values/firebase.xml'.format(variant.build_type)), ) ) @@ -106,6 +107,7 @@ class TaskBuilder(object): 'echo "https://fake@sentry.prod.mozaws.net/368" > .sentry_token', 'echo "--" > .adjust_token', 'echo "-:-" > .leanplum_token', + 'touch .digital_asset_links_token', './gradlew --no-daemon clean assemble{}'.format(variant.name), ))