From 2fecf07dd712c363364382f6c53fe89e5b5ef617 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 5 Jun 2018 18:18:19 +0300 Subject: [PATCH] Test: do not expect copy classes task to run with Gradle 4.0+ --- .../jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 96c40f4ce52..aa4b89faf40 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -173,7 +173,7 @@ abstract class AbstractKotlinAndroidGradleTests( // Execute 'assembleAndroidTest' first, without 'build' side effects project.build("assembleAndroidTest") { assertSuccessful() - if (isLegacyAndroidGradleVersion(androidGradlePluginVersion)) { + if (project.testGradleVersionBelow("4.0")) { val tasks = ArrayList().apply { for (subProject in listOf("Android", "Lib")) { for (flavor in listOf("Flavor1", "Flavor2")) {