From 7c55d94eeb42f851e5ee0664bb38a873b6c06ee1 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Fri, 16 Jun 2017 20:46:59 +0300 Subject: Update gradle to 4.0 --- runners/maven-plugin/build.gradle | 3 +-- runners/maven-plugin/pom.tpl.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'runners/maven-plugin') diff --git a/runners/maven-plugin/build.gradle b/runners/maven-plugin/build.gradle index 3f80ba4a..e1a3af1a 100644 --- a/runners/maven-plugin/build.gradle +++ b/runners/maven-plugin/build.gradle @@ -25,7 +25,7 @@ dependencies { shadow "org.apache.maven.plugin-tools:maven-plugin-annotations:$maven_plugin_tools_version" } -task generatePom << { +task ("generatePom") doLast { final pomTemplate = new File(projectDir, "pom.tpl.xml") final pom = new File(buildDir, "pom.xml") pom.text = pomTemplate.text.replace("dokka_version", "$dokka_version") @@ -43,7 +43,6 @@ task helpMojo(type: CrossPlatformExec) { commandLine mvn, '-e', '-B', 'org.apache.maven.plugins:maven-plugin-plugin:helpmojo' } - helpMojo.dependsOn generatePom sourceSets.main.java.srcDir("$buildDir/generated-sources/plugin") compileJava.dependsOn helpMojo diff --git a/runners/maven-plugin/pom.tpl.xml b/runners/maven-plugin/pom.tpl.xml index 3b5afd74..c5883c6a 100644 --- a/runners/maven-plugin/pom.tpl.xml +++ b/runners/maven-plugin/pom.tpl.xml @@ -21,6 +21,6 @@ ./ - classes/main + ./classes/java/main -- cgit