From 3cb0d489bf734636214e6383c98c532096b4d75f Mon Sep 17 00:00:00 2001
From: Yunir Salimzyanov <yunir.salimzyanov@jetbrains.com>
Date: Mon, 13 Feb 2023 17:42:27 +0000
Subject: [PATCH] KT-55700: fix kotlin-test-sources.jar in compiler lib

to contain both jvm and common parts
as it is made for maven artifacts distribution
---
 libraries/kotlin.test/build.gradle.kts | 8 ++++++++
 prepare/compiler/build.gradle.kts      | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts
index 09861352173..9bfcb07f5cd 100644
--- a/libraries/kotlin.test/build.gradle.kts
+++ b/libraries/kotlin.test/build.gradle.kts
@@ -142,6 +142,14 @@ val combinedSourcesJar by tasks.registering(Jar::class) {
     }
 }
 
+val combinedJvmSourcesJar by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+}
+
+artifacts {
+    add(combinedJvmSourcesJar.name, combinedSourcesJar)
+}
 
 val rootComponent = componentFactory.adhoc("root").apply {
     addVariantsFromConfiguration(jvmApi) {
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 933f35d0b52..d9f351b2566 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -126,7 +126,6 @@ val distSourcesProjects = listOfNotNull(
     ":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
     ":kotlin-test:kotlin-test-junit",
     ":kotlin-test:kotlin-test-junit5",
-    ":kotlin-test:kotlin-test-jvm",
     ":kotlin-test:kotlin-test-testng"
 )
 
@@ -173,6 +172,8 @@ dependencies {
         sources(project(it, configuration = "sources"))
     }
 
+    sources(project(":kotlin-test", "combinedJvmSourcesJar"))
+
     sources(kotlinStdlib("jdk7", classifier = "sources"))
     sources(kotlinStdlib("jdk8", classifier = "sources"))