From e3d930a6a10a8bd12197f97c32b7c23d63b3d231 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 12 Oct 2018 11:56:43 +0300
Subject: [PATCH] Build maven-like stdlib sources artifacts during dist

This is needed to emulate gradle and maven like projects in plugin tests.
---
 .../codegen/forTestCompile/ForTestCompileRuntime.java  | 10 ++++++++++
 libraries/stdlib/common/build.gradle                   |  1 +
 libraries/stdlib/jvm/build.gradle                      |  9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
index f10c59e9f3f..93aa9d021c5 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -74,11 +74,21 @@ public class ForTestCompileRuntime {
         return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-sources.jar"));
     }
 
+    @NotNull
+    public static File stdlibMavenSourcesJarForTests() {
+        return assertExists(new File("dist/maven/kotlin-stdlib-sources.jar"));
+    }
+
     @NotNull
     public static File stdlibCommonForTests() {
         return assertExists(new File("dist/common/kotlin-stdlib-common.jar"));
     }
 
+    @NotNull
+    public static File stdlibCommonSourcesForTests() {
+        return assertExists(new File("dist/common/kotlin-stdlib-common-sources.jar"));
+    }
+
     @NotNull
     public static File stdlibJsForTests() {
         return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-js.jar"));
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index 323bb487201..442bf87910b 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -120,6 +120,7 @@ artifacts {
 // TODO: call the "dist" task instead, once we need to publish kotlin-stdlib-common.jar with the compiler distribution
 task distCommon(type: Copy) {
     from(jar)
+    from(sourcesJar)
     into "$distDir/common"
     rename "-${java.util.regex.Pattern.quote(version)}", ''
 }
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 4b538060567..6e33e78da3e 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -116,17 +116,26 @@ task distSourcesJar(type: Jar) {
     }
 }
 
+task distMavenSources(type: Copy) {
+    from(sourcesJar)
+    into "$distDir/maven"
+    rename "-${java.util.regex.Pattern.quote(version)}", ''
+}
+
 artifacts {
     archives sourcesJar
     archives javadocJar
 }
 
 dist {
+    dependsOn distMavenSources
+
     [jar, distSourcesJar].forEach {
         from(it) {
             rename('dist-', '')
         }
     }
+
     from (configurations.compile) {
         include 'annotations*.jar'
     }