Build: Remove explicit legacy maven plugin application

This commit is contained in:
Vyacheslav Gerasimov
2020-04-24 15:52:00 +03:00
parent 410c5f3e69
commit b85b733e42
6 changed files with 23 additions and 17 deletions
@@ -31,12 +31,18 @@ open class PublishedKotlinModule : Plugin<Project> {
plugins.apply("maven")
val publishedRuntime by configurations.creating {
configurations.maybeCreate("publishedRuntime").apply {
the<MavenPluginConvention>()
.conf2ScopeMappings
.addMapping(0, this, Conf2ScopeMappingContainer.RUNTIME)
}
configurations.maybeCreate("publishedCompile").apply {
the<MavenPluginConvention>()
.conf2ScopeMappings
.addMapping(0, this, Conf2ScopeMappingContainer.COMPILE)
}
if (!project.hasProperty("prebuiltJar")) {
plugins.apply("signing")
+12
View File
@@ -23,3 +23,15 @@ fun DependencyHandler.publishedRuntime(
): ExternalModuleDependency =
addDependencyTo(this, "publishedRuntime", dependencyNotation, dependencyConfiguration)
val NamedDomainObjectContainer<Configuration>.publishedCompile: NamedDomainObjectProvider<Configuration> get() = named("publishedCompile")
fun DependencyHandler.publishedCompile(dependencyNotation: Any): Dependency? =
add("publishedCompile", dependencyNotation)
fun DependencyHandler.publishedCompile(
dependencyNotation: String,
dependencyConfiguration: Action<ExternalModuleDependency>
): ExternalModuleDependency =
addDependencyTo(this, "publishedCompile", dependencyNotation, dependencyConfiguration)
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.pill.PillExtension
plugins {
kotlin("jvm")
maven
id("jps-compatible")
}
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.pill.PillExtension
plugins {
kotlin("jvm")
maven
id("jps-compatible")
}
+4 -13
View File
@@ -1,23 +1,16 @@
import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.COMPILE
plugins {
maven
kotlin("jvm")
id("jps-compatible")
}
val mavenCompileScope by configurations.creating {
the<MavenPluginConvention>()
.conf2ScopeMappings
.addMapping(0, this, COMPILE)
}
description = "Kotlin KLIB Library Commonizer"
publish()
configurations {
runtimeOnly.get().extendsFrom(compileOnly.get())
}
description = "Kotlin KLIB Library Commonizer"
dependencies {
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":compiler:ir.serialization.common"))
@@ -27,7 +20,7 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
// This dependency is necessary to keep the right dependency record inside of POM file:
mavenCompileScope(project(":kotlin-compiler"))
publishedCompile(project(":kotlin-compiler"))
api(kotlinStdlib())
@@ -50,6 +43,4 @@ projectTest(parallel = true) {
workingDir = rootDir
}
publish()
standardPublicJars()
@@ -1,7 +1,6 @@
description = "Kotlin compiler client embeddable"
plugins {
maven
kotlin("jvm")
}