From e0e3d907741491fab15200f83cba196c251cfed0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 30 Oct 2018 02:35:54 +0300 Subject: [PATCH] Convert kotlin-gradle-plugin-api build script: step 2 --- .../kotlin-gradle-plugin-api/build.gradle.kts | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 0c0afcac0fe..77154b72e9c 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -1,37 +1,35 @@ -apply plugin: 'kotlin' -apply plugin: 'maven' -apply plugin: 'jps-compatible' +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import org.jetbrains.kotlin.pill.PillExtension -configureJvmProject(project) -configurePublishing(project) +plugins { + kotlin("jvm") + maven + id("jps-compatible") +} -repositories { - mavenLocal() +standardPublicJars() +publish() + +dependencies { + compile(project(":kotlin-stdlib")) + compile(project(":kotlin-native:kotlin-native-utils")) + + compileOnly(gradleApi()) + compileOnly("com.android.tools.build:gradle:0.4.2") } pill { - variant = "FULL" + variant = PillExtension.Variant.FULL } -dependencies { - compile project(':kotlin-stdlib') - compile project('::kotlin-native:kotlin-native-utils') +tasks { + withType { + kotlinOptions.languageVersion = "1.2" + kotlinOptions.apiVersion = "1.2" + kotlinOptions.freeCompilerArgs += listOf("-Xskip-metadata-version-check") + } - compileOnly gradleApi() - compileOnly 'com.android.tools.build:gradle:0.4.2' -} - -tasks.withType(project.compileKotlin.class) { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"] -} - -artifacts { - archives sourcesJar - archives javadocJar -} - -jar { - manifestAttributes(manifest, project) + named("jar") { + callGroovy("manifestAttributes", manifest, project) + } } \ No newline at end of file