From c8becbd335b2b989ab21ff0051a09aedf3a82275 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sun, 12 Aug 2018 01:06:16 +0300
Subject: [PATCH] Stop distributing and publishing obsolete artifacts

Keep stdlib-jreN dist for tests only.

#KT-23799
---
 libraries/stdlib/jre7/build.gradle    | 9 +++++++--
 libraries/stdlib/jre8/build.gradle    | 9 +++++++--
 libraries/stdlib/js/build.gradle      | 4 ----
 libraries/stdlib/jvm/build.gradle     | 5 -----
 libraries/stdlib/runtime/build.gradle | 4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 4fe35d16315..f892c499e2f 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'pill-configurable'
 
 configureJvm6Project(project)
 configureDist(project)
-configurePublishing(project)
 ext.javaHome = JDK_17
 
 pill {
@@ -44,8 +43,14 @@ artifacts {
     archives javadocJar
 }
 
+task distForTest(type: Copy) {
+    rename "-${java.util.regex.Pattern.quote(version)}", ''
+    from jar
+    into distDir
+}
+
 dist {
-    from (jar, sourcesJar)
+    dependsOn(distForTest)
 }
 
 
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index 16efd6e0f98..fc1a1f6a67b 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'pill-configurable'
 
 configureJvm6Project(project)
 configureDist(project)
-configurePublishing(project)
 ext.javaHome = JDK_18
 ext.jvmTarget = "1.8"
 
@@ -47,8 +46,14 @@ artifacts {
     archives javadocJar
 }
 
+task distForTest(type: Copy) {
+    rename "-${java.util.regex.Pattern.quote(version)}", ''
+    from jar
+    into distDir
+}
+
 dist {
-    from (jar, sourcesJar)
+    dependsOn(distForTest)
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 493c4e476e5..f32854e99f9 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -352,10 +352,6 @@ dist {
     [mergedJar, distSourcesJar].forEach {
         rename("dist-", "")
         from(it)
-        // legacy
-        from(it) {
-            rename("kotlin-stdlib-js", 'kotlin-jslib')
-        }
     }
 }
 
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 9c57bf3c02b..b8127f7be93 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -150,11 +150,6 @@ dist {
         from(it) {
             rename('dist-', '')
         }
-        // legacy
-        from(it) {
-            rename('dist-', '')
-            rename('kotlin-stdlib', 'kotlin-runtime')
-        }
     }
     from (configurations.compile) {
         include 'annotations*.jar'
diff --git a/libraries/stdlib/runtime/build.gradle b/libraries/stdlib/runtime/build.gradle
index 08476d02627..15c79646f66 100644
--- a/libraries/stdlib/runtime/build.gradle
+++ b/libraries/stdlib/runtime/build.gradle
@@ -2,9 +2,9 @@ description 'Kotlin Runtime (deprecated, use kotlin-stdlib artifact instead)'
 
 apply plugin: 'kotlin'
 
+// TODO: Drop this project entirely
+
 configureJvm6Project(project)
-configureDist(project)
-configurePublishing(project)
 
 dependencies {
     compile group: 'org.jetbrains', name: 'annotations', version:'13.0'