From 55784346297ea2977538d3e719aafcce2cc4a8ed Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Fri, 9 Aug 2019 18:35:24 +0300 Subject: [PATCH] Fix: No value has been specified for 'binaryResultsDirectory' (KT-33246) With Gradle 5.5+, set the property `binaryResultsDirectory` that replaces `binResultsDir`. Issue #KT-33246 Fixed --- .../kotlin/gradle/testing/internal/conventions.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt index 06363e139d5..c42083d8779 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt @@ -11,6 +11,7 @@ import org.gradle.api.reporting.ReportingExtension import org.gradle.api.tasks.testing.TestTaskReports import org.gradle.testing.base.plugins.TestingBasePlugin import org.jetbrains.kotlin.gradle.tasks.KotlinTest +import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import java.io.File @Suppress("UnstableApiUsage") @@ -24,7 +25,15 @@ internal val Project.testReportsDir: File internal fun KotlinTest.configureConventions() { reports.configureConventions(project, name) - conventionMapping.map("binResultsDir") { project.testResultsDir.resolve("$name/binary") } + + fun binaryResultsDirDefault(): File = project.testResultsDir.resolve("$name/binary") + + if (isGradleVersionAtLeast(5, 5)) { + @Suppress("UnstableApiUsage") + binaryResultsDirectory.convention(project.layout.buildDirectory.dir(binaryResultsDirDefault().toRelativeString(project.buildDir))) + } else { + conventionMapping.map("binResultsDir", ::binaryResultsDirDefault) + } } internal fun TestTaskReports.configureConventions(project: Project, name: String) {