From 4482c393b6cb81fcaba50a28325e27fc3fabbd22 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 29 Nov 2021 14:12:39 +0300
Subject: [PATCH] [Native] Fix: Return sources for kotlin.test back to K/N
 distribution

---
 kotlin-native/backend.native/build.gradle |  5 -----
 kotlin-native/build.gradle                | 13 +++++--------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle
index b8533c8f70a..1a1ebba76a2 100644
--- a/kotlin-native/backend.native/build.gradle
+++ b/kotlin-native/backend.native/build.gradle
@@ -73,7 +73,6 @@ configurations {
     kotlin_reflect_jar
     kotlin_script_runtime_jar
     trove4j_jar
-    kotlinCommonSources
 
     cli_bcApiElements {
         extendsFrom cli_bcApi
@@ -89,10 +88,6 @@ dependencies {
     kotlin_reflect_jar kotlinReflectModule
     kotlin_script_runtime_jar project(":kotlin-script-runtime")
 
-    [kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
-        kotlinCommonSources(it) { transitive = false }
-    }
-
     compilerApi project(":kotlin-native:utilities:basic-utils")
 
     compilerApi project(kotlinCompilerModule)
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index 59b9037a956..bf3d459c1d0 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -86,9 +86,6 @@ ext {
 
     kotlinCompilerModule= [path: ":kotlin-compiler", configuration: "runtimeElements"]
     kotlinStdLibModule= project(":kotlin-stdlib")
-    kotlinCommonStdlibModule= project(":kotlin-stdlib-common")
-    kotlinTestCommonModule= project(":kotlin-test:kotlin-test-common")
-    kotlinTestAnnotationsCommonModule= project(":kotlin-test:kotlin-test-annotations-common")
     kotlinReflectModule= project(":kotlin-reflect")
     kotlinScriptRuntimeModule= project(":kotlin-script-runtime")
     kotlinUtilKliMetadatabModule= project(":kotlin-util-klib-metadata")
@@ -156,15 +153,12 @@ void loadCommandLineProperties() {
 
 configurations {
     ftpAntTask
-    kotlinCommonSources
     distPack
+    commonSources
 }
 
 dependencies {
     ftpAntTask 'org.apache.ant:ant-commons-net:1.9.9'
-    [kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
-        kotlinCommonSources(it) { transitive = false }
-    }
     distPack project(':kotlin-native:Interop:Runtime')
     distPack project(':kotlin-native:Interop:Indexer')
     distPack project(':kotlin-native:Interop:StubGenerator')
@@ -175,6 +169,9 @@ dependencies {
     distPack project(':kotlin-native:klib')
     distPack project(path: ':kotlin-native:endorsedLibraries:kotlinx.cli', configuration: "jvmRuntimeElements")
     //distPack "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
+    commonSources project(path: ':kotlin-stdlib-common', configuration: 'sources')
+    commonSources project(path: ':kotlin-test:kotlin-test-common', configuration: 'sources')
+    commonSources project(path: ':kotlin-test:kotlin-test-annotations-common', configuration: 'sources')
 }
 
 //task sharedJar {
@@ -199,7 +196,7 @@ task build {
 
 task distCommonSources(type: CopyCommonSources) {
     outputDir "$distDir/sources"
-    sourcePaths project(":kotlin-stdlib-common").file("src")
+    sourcePaths configurations.commonSources
     zipSources true
 }