From 7097246866d25e29ea77876a151b3481436e27c6 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Sat, 6 May 2017 01:17:08 +0300 Subject: [PATCH] Unify build output with Maven * Added manifest properties to `gradle-tools` projects. * Add `-kotlin-module` to free compiler args to make the module names match the ones in Maven build * Fixed path to the Groovy sources in `kotlin-gradle-plugin/pom.xml` --- libraries/tools/gradle-tools/build.gradle | 8 ++++++++ libraries/tools/kotlin-gradle-plugin/pom.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/tools/gradle-tools/build.gradle b/libraries/tools/gradle-tools/build.gradle index 5fe8f08969a..6e8d2d23728 100644 --- a/libraries/tools/gradle-tools/build.gradle +++ b/libraries/tools/gradle-tools/build.gradle @@ -29,6 +29,14 @@ subprojects { task javadocJar(type: Jar) { classifier = 'javadoc' } + + afterEvaluate { + jar { + manifestAttributes(manifest, project) + } + + compileKotlin.kotlinOptions.freeCompilerArgs += ["-module-name", "${project.name}"] + } } task clean { diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml index b51c8286008..b91126cdb1e 100644 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin/pom.xml @@ -149,7 +149,7 @@ - ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/groovy **/*.groovy