From feccc5785f5778b0a2f9abd613e34e21c068fc36 Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Wed, 20 Apr 2022 01:43:21 +0300
Subject: [PATCH] [Build] Revert workaround introduced in 2f39a656

---
 libraries/kotlin.test/js/build.gradle        | 4 +---
 libraries/stdlib/js-v1/build.gradle          | 4 +---
 prepare/compiler-embeddable/build.gradle.kts | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 06745cc16aa..6ab6fcb3033 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -56,10 +56,8 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
 
     duplicatesStrategy DuplicatesStrategy.FAIL
 
-    // workaround for https://github.com/gradle/gradle/issues/17936
     def archiveOperations = services.get(ArchiveOperations)
-    RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
-    from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
+    from { libraryJarWithoutIr.archiveFile.map { archiveOperations.zipTree(it) } }
 
     dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
     from {
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 08c9979a541..d344633445d 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -276,10 +276,8 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
 
     duplicatesStrategy DuplicatesStrategy.FAIL
 
-    // workaround for https://github.com/gradle/gradle/issues/17936
     def archiveOperations = services.get(ArchiveOperations)
-    RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
-    from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
+    from { libraryJarWithoutIr.archiveFile.map {archiveOperations.zipTree(it) } }
     dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
     from {
         def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs")
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index e97dfa10107..f5a3f33c4a5 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -57,19 +57,15 @@ val runtimeJar = runtimeJar(embeddableCompiler()) {
 sourcesJar {
     val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar")
     dependsOn(compilerTask)
-    // workaround for https://github.com/gradle/gradle/issues/17936
     val archiveOperations = serviceOf<ArchiveOperations>()
-    val sourcesJar by lazy { compilerTask.get().archiveFile.get() }
-    from({ archiveOperations.zipTree(sourcesJar) })
+    from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
 }
 
 javadocJar {
     val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar")
     dependsOn(compilerTask)
-    // workaround for https://github.com/gradle/gradle/issues/17936
     val archiveOperations = serviceOf<ArchiveOperations>()
-    val javadocJarFile by lazy { compilerTask.get().archiveFile.get() }
-    from({ archiveOperations.zipTree(javadocJarFile) })
+    from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
 }
 
 projectTest {