From caca7c67f4379eff72cd940472a6daa2d125e9da Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 24 Oct 2017 20:28:54 +0200
Subject: [PATCH] Fix "base" jar and "public" jar tasks archive name conflict

fixes KT-20877
---
 .../kotlin-annotation-processing/build.gradle.kts   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
index 0942422aad4..2c848445d7a 100644
--- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts
+++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
@@ -24,14 +24,11 @@ projectTest {
     workingDir = projectDir
 }
 
-//noDefaultJar()
-//tasks.remove(tasks.findByName("jar"))
-//
-//runtimeJar(task<ShadowJar>("jar"))  {
-//    from(packedJars)
-//    from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
-//    configureRelocation()
-//}
+val jar: Jar by tasks
+jar.apply {
+    classifier = "base"
+}
+
 runtimeJar(rewriteDepsToShadedCompiler(
         task<ShadowJar>("shadowJar")  {
             from(packedJars)