From 12e2a3c6b8bf1533148ddf29c77e73f5045754a6 Mon Sep 17 00:00:00 2001 From: aSemy <897017+aSemy@users.noreply.github.com> Date: Thu, 16 Mar 2023 02:15:49 +0100 Subject: Refactor Maven Runner build config (#2911) --- integration-tests/maven/build.gradle.kts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'integration-tests/maven') 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().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) + } } -- cgit