Fix AbstractArchiveTask deprecations

This commit is contained in:
Jerome Prinet
2022-04-08 10:49:06 +02:00
committed by Vyacheslav Gerasimov
parent 44b2905800
commit 61b12c9dbf
4 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -79,14 +79,14 @@ val serializeJvm = serializeTask("serializeJvm", prepareSourcesJvm, listOf(built
val builtinsJar by task<Jar> { val builtinsJar by task<Jar> {
dependsOn(serialize) dependsOn(serialize)
from(serialize) { include("kotlin/**") } from(serialize) { include("kotlin/**") }
destinationDir = File(buildDir, "libs") destinationDirectory.set(File(buildDir, "libs"))
} }
val builtinsJvmJar by task<Jar> { val builtinsJvmJar by task<Jar> {
dependsOn(serializeJvm) dependsOn(serializeJvm)
from(serializeJvm) { include("kotlin/**") } from(serializeJvm) { include("kotlin/**") }
archiveClassifier.set("jvm") archiveClassifier.set("jvm")
destinationDir = File(buildDir, "libs") destinationDirectory.set(File(buildDir, "libs"))
} }
val assemble by tasks.getting { val assemble by tasks.getting {
@@ -53,7 +53,7 @@ if (deployVersion != null) {
runtimeJar(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"] = archiveVersion
from(mainSourceSet.output) from(mainSourceSet.output)
exclude("**/*.proto") exclude("**/*.proto")
@@ -42,7 +42,7 @@ if (deployVersion != null) {
runtimeJar(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"] = archiveVersion
from(mainSourceSet.output) from(mainSourceSet.output)
exclude("**/*.proto") exclude("**/*.proto")
+2 -2
View File
@@ -43,8 +43,8 @@ projectTest {
val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt") val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt")
val shadowJar by task<ShadowJar> { val shadowJar by task<ShadowJar> {
classifier = "shadow" archiveClassifier.set("shadow")
version = null archiveVersion.set("")
configurations = listOf(shadows) configurations = listOf(shadows)
from(mainSourceSet.output) from(mainSourceSet.output)
manifest { manifest {