From b5195d36bc014a8d9de2f7b4aa3216c208855ebf Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 12 Feb 2018 18:33:15 +0300 Subject: [PATCH] Use Gradle 3.4 for testCleanBuildLib because of classpath normalization --- .../gradle/IncrementalCompilationMultiProjectIT.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 0f93e653873..c37c5d39fca 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -90,15 +90,15 @@ open class A { @Test fun testCleanBuildLib() { - val project = Project("incrementalMultiproject") + // Test with Gradle 3.4, since Gradle 3.5+ uses classpath hash normalization for JARs + val project = Project("incrementalMultiproject", GradleVersionRequired.Exact("3.4")) + + project.setupWorkingDir() + project.build("build") { assertSuccessful() } - if (project.testGradleVersionAtLeast("4.0")) { - File(project.projectDir, "lib/build.gradle").appendText("\nkotlin.copyClassesToJavaOutput = true") - } - project.build(":lib:clean", ":lib:build") { assertSuccessful() val affectedSources = File(project.projectDir, "lib").allKotlinFiles()