From 674f6c170df0548fe2e0af7b854f7fa4c1628f7f Mon Sep 17 00:00:00 2001 From: Allison Morris Date: Thu, 20 Jun 2019 10:34:16 -0800 Subject: [PATCH] Generalize parent repository logic. This commit generalizes the path to the parent repository which contains the m2repository for the smoke tests. --- smoke-tests/build.gradle | 11 ----------- smoke-tests/configure.gradle | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle index 16d705a7ced..87a0a9dfdd6 100644 --- a/smoke-tests/build.gradle +++ b/smoke-tests/build.gradle @@ -77,17 +77,6 @@ android { } } -repositories { - google() - jcenter() - - // This is necessary for Bill of Materials injection. This repository is created by running the - // `publishAllToBuildDir` task on the main firebase-android-sdk project. - maven { - url "../build/m2repository/" - } -} - apply from: "configure.gradle" dependencies { diff --git a/smoke-tests/configure.gradle b/smoke-tests/configure.gradle index cea3e7237b6..9caa0d0eaba 100644 --- a/smoke-tests/configure.gradle +++ b/smoke-tests/configure.gradle @@ -30,4 +30,23 @@ def configurePlatform() { } } +def configureRepositories() { + def m2repo = "../build/m2repository/" + if (project.hasProperty("m2repo")) { + m2repo = project.getProperty("m2repo") + } + + project.repositories { + // This is necessary for Bill of Materials injection. This repository is created by running the + // `assembleAllForSmokeTests` task on the main firebase-android-sdk project. + maven { + url m2repo + } + + google() + jcenter() + } +} + +configureRepositories() configurePlatform()