From 8db1c52c09c073a0cd54732dfb4107b852ada901 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 15 Jul 2021 10:38:33 +0200 Subject: [PATCH] Exclude Gradle Kotlin runtime from 'sam-with-receiver' plugin. This should remove warnings on multiple dependencies versions in the build classpath runtime. ^KT-47636 Fixed --- .../kotlin-sam-with-receiver/build.gradle | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 374294949e4..9c9f34e6ab1 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -1,41 +1,24 @@ -apply plugin: 'kotlin' -apply plugin: 'jps-compatible' - -configurePublishing(project) +plugins { + id "gradle-plugin-common-configuration" + id "jps-compatible" +} pill { variant = 'FULL' } dependencies { - compile project(':kotlin-gradle-plugin-api') - compile project(':kotlin-gradle-plugin-model') + api project(':kotlin-gradle-plugin-api') + api project(':kotlin-gradle-plugin-model') - compile kotlinStdlib() compileOnly project(':compiler') compileOnly project(':kotlin-sam-with-receiver-compiler-plugin') - compileOnly gradleApi() - testCompile gradleApi() testCompile "junit:junit:4.12" embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false } } -tasks.withType(project.compileKotlin.class) { - kotlinOptions.languageVersion = "1.3" - kotlinOptions.apiVersion = "1.3" - kotlinOptions.freeCompilerArgs += [ - "-Xskip-prerelease-check", "-Xskip-runtime-version-check", "-Xsuppress-version-warnings" - ] -} - -jar { - manifestAttributes(manifest, project) -} - ArtifactsKt.noDefaultJar(project) ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) -configureSourcesJar() -configureJavadocJar()