merge master

Piotr Mądry · Piotr Mądry · commit 9d4056a98d52 · 2019-03-06T19:33:30.000+01:00
diff --git a/plugin/src/main/java/com/appunite/firebasetestlabplugin/cloud/FirebaseTestLabProcessCreator.kt b/plugin/src/main/java/com/appunite/firebasetestlabplugin/cloud/FirebaseTestLabProcessCreator.kt
@@ -71,7 +71,7 @@ object FirebaseTestLabProcessCreator {
                 .plus(if (device.testTargets.isNotEmpty()) sequenceOf("--test-targets=${device.testTargets.joinToString(",")}") else sequenceOf())
                 .plus(device.customParamsForGCloudTool)
                 .plus(device.testRunnerClass?.let { sequenceOf("--test-runner-class=$it") } ?: sequenceOf())
-                .plus(if (device.timeout > 0) sequenceOf("--timeoutSec=${device.timeout}s") else sequenceOf())
+                .plus(if (device.timeout > 0) sequenceOf("--timeout=${device.timeout}s") else sequenceOf())
                 .toList()
         )
     }
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':plugin'
+include ':plugin', ':sample'

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ object FirebaseTestLabProcessCreator {`
`71`	`71`	`.plus(if (device.testTargets.isNotEmpty()) sequenceOf("--test-targets=${device.testTargets.joinToString(",")}") else sequenceOf())`
`72`	`72`	`.plus(device.customParamsForGCloudTool)`
`73`	`73`	`.plus(device.testRunnerClass?.let { sequenceOf("--test-runner-class=$it") } ?: sequenceOf())`
`74`		`- .plus(if (device.timeout > 0) sequenceOf("--timeoutSec=${device.timeout}s") else sequenceOf())`
	`74`	`+ .plus(if (device.timeout > 0) sequenceOf("--timeout=${device.timeout}s") else sequenceOf())`
`75`	`75`	`.toList()`
`76`	`76`	`)`
`77`	`77`	`}`