Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/#1178-rewrite_scripts_to_kotlin'…
Browse files Browse the repository at this point in the history
… into #1178-rewrite_scripts_to_kotlin

# Conflicts:
#	flank-bash/scripts/updateFlank.main.kts
  • Loading branch information
Piotr Adamczyk committed Oct 15, 2020
2 parents 6f55434 + 86195b7 commit 40907bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions flank-bash/scripts/android.ops.main.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit 40907bc

Please sign in to comment.