From a88ef04671cec68141a3ce5b985f63ac41bda2ff Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Fri, 16 Sep 2022 13:58:00 +0300
Subject: [PATCH] [K/N] Turn back red code.

For some reason build is failing during publication
with the previous change. Will deal with it later.
---
 kotlin-native/Interop/StubGenerator/build.gradle.kts | 11 +++++------
 kotlin-native/utilities/cli-runner/build.gradle      |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/kotlin-native/Interop/StubGenerator/build.gradle.kts b/kotlin-native/Interop/StubGenerator/build.gradle.kts
index 957f1fa4e59..c901c4976bf 100644
--- a/kotlin-native/Interop/StubGenerator/build.gradle.kts
+++ b/kotlin-native/Interop/StubGenerator/build.gradle.kts
@@ -30,13 +30,10 @@ application {
 dependencies {
     implementation(project(":kotlin-native:Interop:Indexer"))
     implementation(project(":kotlin-native:utilities:basic-utils"))
-    implementation(project(":kotlin-native-shared"))
     api(project(path = ":kotlin-native:endorsedLibraries:kotlinx.cli", configuration = "jvmRuntimeElements"))
 
     api(project(":kotlin-stdlib"))
     api(project(path = ":kotlin-compiler", configuration = "runtimeElements"))
-    // It is shadowed by kotlinx-metadata-klib, so to make IDE happy let's use it as compile-only.
-    compileOnly(project(":kotlinx-metadata"))
     api(project(":kotlinx-metadata-klib"))
     api(project(":native:kotlin-native-utils"))
     implementation(project(":compiler:util"))
@@ -44,8 +41,6 @@ dependencies {
 
     testImplementation(kotlin("test-junit"))
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    // It is shadowed by kotlinx-metadata-klib, so to make IDE happy let's use it as compile-only.
-    testCompileOnly(project(":kotlinx-metadata"))
 }
 
 tasks {
@@ -62,6 +57,10 @@ tasks {
 
 sourceSets {
     "main" {
-        kotlin.srcDir(project.kotlinNativeVersionSrc())
+        kotlin {
+            srcDir(project.kotlinNativeVersionSrc())
+            srcDir("../../shared/src/library/kotlin")
+            srcDir("../../shared/src/main/kotlin")
+        }
     }
 }
\ No newline at end of file
diff --git a/kotlin-native/utilities/cli-runner/build.gradle b/kotlin-native/utilities/cli-runner/build.gradle
index 1460d078582..d96db73c3c0 100644
--- a/kotlin-native/utilities/cli-runner/build.gradle
+++ b/kotlin-native/utilities/cli-runner/build.gradle
@@ -23,5 +23,4 @@ dependencies {
     implementation project(':kotlin-native:Interop:StubGenerator')
     implementation project(':kotlin-native:klib')
     implementation project(":kotlin-native:utilities:basic-utils")
-    implementation project(":kotlin-native-shared")
 }