From 61b12c9dbfaad49b45330099422c609cce077a7c Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Fri, 8 Apr 2022 10:49:06 +0200
Subject: [PATCH] Fix AbstractArchiveTask deprecations

---
 core/builtins/build.gradle.kts                   | 4 ++--
 libraries/kotlinx-metadata/jvm/build.gradle.kts  | 2 +-
 libraries/kotlinx-metadata/klib/build.gradle.kts | 2 +-
 libraries/tools/kotlinp/build.gradle.kts         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index e62ecdcd5ac..724698fdb0d 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -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 {
diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts
index 17353f43bc8..7b20e0f980b 100644
--- a/libraries/kotlinx-metadata/jvm/build.gradle.kts
+++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts
@@ -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")
diff --git a/libraries/kotlinx-metadata/klib/build.gradle.kts b/libraries/kotlinx-metadata/klib/build.gradle.kts
index 805635ec3b9..f78e3673285 100644
--- a/libraries/kotlinx-metadata/klib/build.gradle.kts
+++ b/libraries/kotlinx-metadata/klib/build.gradle.kts
@@ -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")
diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts
index acd148733c8..ea2181af350 100644
--- a/libraries/tools/kotlinp/build.gradle.kts
+++ b/libraries/tools/kotlinp/build.gradle.kts
@@ -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 {