Build: fix kotlinx-metadata-jvm publication
Co-authored-by: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
This commit is contained in:
@@ -71,18 +71,6 @@ fun Project.noDefaultJar() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Task> Project.runtimeJarArtifactBy(
|
|
||||||
task: TaskProvider<T>,
|
|
||||||
artifactRef: Any,
|
|
||||||
body: ConfigurablePublishArtifact.() -> Unit = {}
|
|
||||||
) {
|
|
||||||
addArtifact("archives", task, artifactRef, body)
|
|
||||||
addArtifact("runtimeJar", task, artifactRef, body)
|
|
||||||
configurations.findByName("runtime")?.let {
|
|
||||||
addArtifact(it.name, task, artifactRef, body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Project.runtimeJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> = runtimeJar(getOrCreateTask("jar", body)) { }
|
fun Project.runtimeJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> = runtimeJar(getOrCreateTask("jar", body)) { }
|
||||||
|
|
||||||
fun <T : Jar> Project.runtimeJar(task: TaskProvider<T>, body: T.() -> Unit = {}): TaskProvider<T> {
|
fun <T : Jar> Project.runtimeJar(task: TaskProvider<T>, body: T.() -> Unit = {}): TaskProvider<T> {
|
||||||
@@ -103,7 +91,11 @@ fun <T : Jar> Project.runtimeJar(task: TaskProvider<T>, body: T.() -> Unit = {})
|
|||||||
body()
|
body()
|
||||||
}
|
}
|
||||||
|
|
||||||
project.runtimeJarArtifactBy(task, task)
|
project.addArtifact("archives", task, task)
|
||||||
|
project.addArtifact("runtimeJar", task, task)
|
||||||
|
project.configurations.findByName("runtime")?.let {
|
||||||
|
project.addArtifact(it.name, task, task)
|
||||||
|
}
|
||||||
|
|
||||||
val runtimeJar = configurations.maybeCreate("runtimeJar").apply {
|
val runtimeJar = configurations.maybeCreate("runtimeJar").apply {
|
||||||
isCanBeConsumed = true
|
isCanBeConsumed = true
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ if (deployVersion != null) {
|
|||||||
|
|
||||||
noDefaultJar()
|
noDefaultJar()
|
||||||
|
|
||||||
val shadowJar = tasks.register<ShadowJar>("shadowJar") {
|
runtimeJar(tasks.register<ShadowJar>("shadowJar")) {
|
||||||
callGroovy("manifestAttributes", manifest, project)
|
callGroovy("manifestAttributes", manifest, project)
|
||||||
manifest.attributes["Implementation-Version"] = version
|
manifest.attributes["Implementation-Version"] = version
|
||||||
|
|
||||||
@@ -64,8 +64,6 @@ val shadowJar = tasks.register<ShadowJar>("shadowJar") {
|
|||||||
relocate("org.jetbrains.kotlin", "kotlinx.metadata.internal")
|
relocate("org.jetbrains.kotlin", "kotlinx.metadata.internal")
|
||||||
}
|
}
|
||||||
|
|
||||||
runtimeJarArtifactBy(shadowJar, shadowJar)
|
|
||||||
|
|
||||||
val test by tasks
|
val test by tasks
|
||||||
test.dependsOn("shadowJar")
|
test.dependsOn("shadowJar")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user