From 86195b7aaf9ce9ef72a2108e4c6c20c3e2a2fce1 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 15 Oct 2020 17:37:17 +0200 Subject: [PATCH] Update android script --- flank-bash/scripts/android.ops.main.kts | 4 ++-- flank-bash/scripts/updateFlank.main.kts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flank-bash/scripts/android.ops.main.kts b/flank-bash/scripts/android.ops.main.kts index 4a6c0d56ca..7f1caa05aa 100644 --- a/flank-bash/scripts/android.ops.main.kts +++ b/flank-bash/scripts/android.ops.main.kts @@ -77,7 +77,7 @@ suspend fun Shell.buildMultiModulesApks() { shell { createGradleCommand( workingDir = androidTestProjectsPath, - options = listOf(":multi-modules:multiapp:assemble") + (1..20).map { ":multi-modules:testModule$it:assembleAndroidTest" })() + options = listOf("-p", androidTestProjectsPath, ":multi-modules:multiapp:assemble") + (1..20).map { ":multi-modules:testModule$it:assembleAndroidTest" })() } val outputDir = Paths.get(flankFixturesTmpPath, "apk", "multi-modules").toString() Paths.get(androidTestProjectsPath, "multi-modules").toFile().findApks() @@ -88,7 +88,7 @@ suspend fun Shell.buildCucumberSampleApp() { shell { createGradleCommand( workingDir = androidTestProjectsPath, - options = listOf("cucumber_sample_app:cukeulator:assembleDebug", ":cucumber_sample_app:cukeulator:assembleAndroidTest") + options = listOf("-p", androidTestProjectsPath, "cucumber_sample_app:cukeulator:assembleDebug", ":cucumber_sample_app:cukeulator:assembleAndroidTest") )() } val outputDir = Paths.get(flankFixturesTmpPath, "apk", "cucumber_sample_app").toString() diff --git a/flank-bash/scripts/updateFlank.main.kts b/flank-bash/scripts/updateFlank.main.kts index 0be026c6c5..ab03cd0b3c 100644 --- a/flank-bash/scripts/updateFlank.main.kts +++ b/flank-bash/scripts/updateFlank.main.kts @@ -18,7 +18,6 @@ shell { createGradleCommand( workingDir = rootDirectoryPathString, options = ":test_runner:clean", ":test_runner:assemble", ":test_runner:shadowJar")() - } Paths.get(flankDirectory.toString(), "build", "libs", "flank.jar").toFile()