From b64c7cce840a9d525deb843bb9e285563709d8e3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Tue, 25 Feb 2020 16:54:18 +0300
Subject: [PATCH] Build: Use Jar task for :kotlin-compiler:packCompiler

Right now can't be cached between builds because of compiler version.
We may move module containing compiler version directly to the final jar
---
 prepare/compiler/build.gradle.kts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 21299f8a9e7..f8a884895d7 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -222,13 +222,15 @@ dependencies {
 
 publish()
 
-val packCompiler by task<ShadowJar> {
-    configurations = emptyList()
+val packCompiler by task<Jar> {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     destinationDirectory.set(File(buildDir, "libs"))
     archiveClassifier.set("before-proguard")
 
-    from(fatJarContents)
+    dependsOn(fatJarContents)
+    from {
+        fatJarContents.map(::zipTree)
+    }
 
     dependsOn(fatJarContentsStripServices)
     from {