aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/maven
diff options
context:
space:
mode:
Diffstat (limited to 'integration-tests/maven')
-rw-r--r--integration-tests/maven/build.gradle.kts13
1 files changed, 7 insertions, 6 deletions
diff --git a/integration-tests/maven/build.gradle.kts b/integration-tests/maven/build.gradle.kts
index 4b8b6011..a2e7c440 100644
--- a/integration-tests/maven/build.gradle.kts
+++ b/integration-tests/maven/build.gradle.kts
@@ -1,12 +1,10 @@
-import org.jetbrains.SetupMaven
import org.jetbrains.dependsOnMavenLocalPublication
plugins {
id("org.jetbrains.conventions.dokka-integration-test")
+ id("org.jetbrains.conventions.maven-cli-setup")
}
-evaluationDependsOn(":runners:maven-plugin")
-
dependencies {
implementation(project(":integration-tests"))
implementation(kotlin("stdlib"))
@@ -16,10 +14,13 @@ dependencies {
tasks.integrationTest {
dependsOnMavenLocalPublication()
- val setupMavenTask = project(":runners:maven-plugin").tasks.withType<SetupMaven>().single()
- dependsOn(setupMavenTask)
+ dependsOn(tasks.installMavenBinary)
+ val mvn = setupMavenProperties.mvn
+ inputs.file(mvn)
val dokka_version: String by project
environment("DOKKA_VERSION", dokka_version)
- environment("MVN_BINARY_PATH", setupMavenTask.mvn.absolutePath)
+ doFirst("workaround for https://github.com/gradle/gradle/issues/24267") {
+ environment("MVN_BINARY_PATH", mvn.get().asFile.invariantSeparatorsPath)
+ }
}