Fix AbstractArchiveTask deprecations
This commit is contained in:
committed by
Vyacheslav Gerasimov
parent
44b2905800
commit
61b12c9dbf
@@ -79,14 +79,14 @@ val serializeJvm = serializeTask("serializeJvm", prepareSourcesJvm, listOf(built
|
||||
val builtinsJar by task<Jar> {
|
||||
dependsOn(serialize)
|
||||
from(serialize) { include("kotlin/**") }
|
||||
destinationDir = File(buildDir, "libs")
|
||||
destinationDirectory.set(File(buildDir, "libs"))
|
||||
}
|
||||
|
||||
val builtinsJvmJar by task<Jar> {
|
||||
dependsOn(serializeJvm)
|
||||
from(serializeJvm) { include("kotlin/**") }
|
||||
archiveClassifier.set("jvm")
|
||||
destinationDir = File(buildDir, "libs")
|
||||
destinationDirectory.set(File(buildDir, "libs"))
|
||||
}
|
||||
|
||||
val assemble by tasks.getting {
|
||||
|
||||
@@ -53,7 +53,7 @@ if (deployVersion != null) {
|
||||
|
||||
runtimeJar(tasks.register<ShadowJar>("shadowJar")) {
|
||||
callGroovy("manifestAttributes", manifest, project)
|
||||
manifest.attributes["Implementation-Version"] = version
|
||||
manifest.attributes["Implementation-Version"] = archiveVersion
|
||||
|
||||
from(mainSourceSet.output)
|
||||
exclude("**/*.proto")
|
||||
|
||||
@@ -42,7 +42,7 @@ if (deployVersion != null) {
|
||||
|
||||
runtimeJar(tasks.register<ShadowJar>("shadowJar")) {
|
||||
callGroovy("manifestAttributes", manifest, project)
|
||||
manifest.attributes["Implementation-Version"] = version
|
||||
manifest.attributes["Implementation-Version"] = archiveVersion
|
||||
|
||||
from(mainSourceSet.output)
|
||||
exclude("**/*.proto")
|
||||
|
||||
@@ -43,8 +43,8 @@ projectTest {
|
||||
val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt")
|
||||
|
||||
val shadowJar by task<ShadowJar> {
|
||||
classifier = "shadow"
|
||||
version = null
|
||||
archiveClassifier.set("shadow")
|
||||
archiveVersion.set("")
|
||||
configurations = listOf(shadows)
|
||||
from(mainSourceSet.output)
|
||||
manifest {
|
||||
|
||||
Reference in New Issue
Block a user