Build: Stop publishing jars with original classifier
#KTI-580
This commit is contained in:
committed by
teamcityserver
parent
fb805028c1
commit
58f1fb644f
@@ -62,8 +62,6 @@ fun Project.removeArtifacts(configuration: Configuration, task: Task) {
|
|||||||
|
|
||||||
fun Project.noDefaultJar() {
|
fun Project.noDefaultJar() {
|
||||||
tasks.named("jar").configure {
|
tasks.named("jar").configure {
|
||||||
enabled = false
|
|
||||||
actions = emptyList()
|
|
||||||
configurations.forEach { cfg ->
|
configurations.forEach { cfg ->
|
||||||
removeArtifacts(cfg, this)
|
removeArtifacts(cfg, this)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ jar {
|
|||||||
manifestAttributes(manifest, project)
|
manifestAttributes(manifest, project)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ArtifactsKt.noDefaultJar(project)
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
configureSourcesJar()
|
configureSourcesJar()
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
|||||||
configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
|
configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure {
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure {
|
||||||
dependsOn(jarContents)
|
dependsOn(jarContents)
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ publishGradlePlugin()
|
|||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
javadocJar()
|
javadocJar()
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ jar {
|
|||||||
manifestAttributes(manifest, project)
|
manifestAttributes(manifest, project)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ArtifactsKt.noDefaultJar(project)
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
configureSourcesJar()
|
configureSourcesJar()
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ jar {
|
|||||||
manifestAttributes(manifest, project)
|
manifestAttributes(manifest, project)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ArtifactsKt.noDefaultJar(project)
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
configureSourcesJar()
|
configureSourcesJar()
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ jar {
|
|||||||
manifestAttributes(manifest, project)
|
manifestAttributes(manifest, project)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ArtifactsKt.noDefaultJar(project)
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
configureSourcesJar()
|
configureSourcesJar()
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ dependencies {
|
|||||||
|
|
||||||
publish()
|
publish()
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ sourceSets {
|
|||||||
|
|
||||||
publish()
|
publish()
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ dependencies {
|
|||||||
|
|
||||||
publish()
|
publish()
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ dependencies {
|
|||||||
|
|
||||||
publish()
|
publish()
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ sourceSets {
|
|||||||
|
|
||||||
publish()
|
publish()
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
|
|||||||
Reference in New Issue
Block a user