From 4f9e180a1f9e9e0432bf1aed379c024736623d12 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 8 Jul 2020 12:15:30 +0200
Subject: Implement SetupMaven task

---
 integration-tests/maven/build.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'integration-tests')

diff --git a/integration-tests/maven/build.gradle.kts b/integration-tests/maven/build.gradle.kts
index b0187b13..1c747bbc 100644
--- a/integration-tests/maven/build.gradle.kts
+++ b/integration-tests/maven/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.SetupMaven
 import org.jetbrains.dependsOnMavenLocalPublication
 
 evaluationDependsOn(":runners:maven-plugin")
@@ -9,9 +10,11 @@ dependencies {
 
 tasks.integrationTest {
     dependsOnMavenLocalPublication()
-    dependsOn(":runners:maven-plugin:setupMaven")
+
+    val setupMavenTask = project(":runners:maven-plugin").tasks.withType<SetupMaven>().single()
+    dependsOn(setupMavenTask)
 
     val dokka_version: String by project
     environment("DOKKA_VERSION", dokka_version)
-    environment("MVN_BINARY_PATH", project(":runners:maven-plugin").extra["MVN_BINARY_PATH"].toString())
+    environment("MVN_BINARY_PATH", setupMavenTask.mvn.absolutePath)
 }
-- 
cgit