diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 5cabcb6db73..18c18b6e367 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -71,18 +71,6 @@ fun Project.noDefaultJar() { } } -fun Project.runtimeJarArtifactBy( - task: TaskProvider, - 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 = runtimeJar(getOrCreateTask("jar", body)) { } fun Project.runtimeJar(task: TaskProvider, body: T.() -> Unit = {}): TaskProvider { @@ -103,7 +91,11 @@ fun Project.runtimeJar(task: TaskProvider, body: T.() -> Unit = {}) 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 { isCanBeConsumed = true diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index b7fa1993e17..6a6c85bbacb 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -54,7 +54,7 @@ if (deployVersion != null) { noDefaultJar() -val shadowJar = tasks.register("shadowJar") { +runtimeJar(tasks.register("shadowJar")) { callGroovy("manifestAttributes", manifest, project) manifest.attributes["Implementation-Version"] = version @@ -64,8 +64,6 @@ val shadowJar = tasks.register("shadowJar") { relocate("org.jetbrains.kotlin", "kotlinx.metadata.internal") } -runtimeJarArtifactBy(shadowJar, shadowJar) - val test by tasks test.dependsOn("shadowJar")