workaround for stanfy/spoon-gradle-plugin#80

release 1.0.50
koral-- · Apr 19, 2017 · e73a775 · e73a775
1 parent dc7a8ab
commit e73a775
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.0.49
+VERSION_NAME=1.0.50
 GROUP=pl.droidsonroids.gradle.ci
 POM_DESCRIPTION=Gradle plugin for CI Android projects on Jenkins
 POM_URL=https://github.com/koral--/android-gradle-jenkins-plugin

diff --git a/plugin/CHANGELOG.md b/plugin/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.0.50
+-  Added workaround for spoon bug https://github.com/stanfy/spoon-gradle-plugin/issues/80
+
 ### 1.0.49
 - Android Gradle plugin version bump to 2.3.1
 

diff --git a/plugin/src/main/kotlin/pl/droidsonroids/gradle/ci/Extenstions.kt b/plugin/src/main/kotlin/pl/droidsonroids/gradle/ci/Extenstions.kt
@@ -93,15 +93,22 @@ fun Project.configureUiTests(android: AppExtension) {
         it.appExtension(android)
     })
 
-    apply(mapOf("plugin" to "spoon"))
+    val isSplitEnabled = android.splits.let { it.abi.isEnable || it.density.isEnable || it.language.isEnable }
 
-    val spoonTask = tasks.getByName(SPOON_TASK_NAME)
-    spoonTask.mustRunAfter(deviceSetupTask)
+    val instrumentationTestTask = when {
+        isSplitEnabled -> tasks.getByName("connectedCheck")
+        else -> {
+            apply(mapOf("plugin" to "spoon"))
+            tasks.getByName(SPOON_TASK_NAME)
+        }
+    }
+
+    instrumentationTestTask.mustRunAfter(deviceSetupTask)
 
     tasks.create(CONNECTED_UI_TEST_TASK_NAME) {
         it.group = "verification"
         it.description = "Setups connected devices and performs instrumentation tests"
-        it.dependsOn(spoonTask, deviceSetupTask)
+        it.dependsOn(instrumentationTestTask, deviceSetupTask)
         it.finalizedBy(deviceSetupRevertTask)
     }
 }