From 7c55d94eeb42f851e5ee0664bb38a873b6c06ee1 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Fri, 16 Jun 2017 20:46:59 +0300
Subject: Update gradle to 4.0

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 runners/maven-plugin/build.gradle        | 3 +--
 runners/maven-plugin/pom.tpl.xml         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb730356..8e2efd2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
\ No newline at end of file
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("<version>dokka_version</version>", "<version>$dokka_version</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 @@
             </plugin>
         </plugins>
         <directory>./</directory>
-        <outputDirectory>classes/main</outputDirectory>
+        <outputDirectory>./classes/java/main</outputDirectory>
     </build>
 </project>
-- 
cgit