From 0827d2e8a36089cedd655f8835a8307459b09dd2 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 25 May 2020 17:43:53 +0700
Subject: [PATCH] [Commonizer] Fix Gradle module dependencies

---
 native/commonizer/build.gradle.kts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts
index 48865f47ca9..3669d7844cd 100644
--- a/native/commonizer/build.gradle.kts
+++ b/native/commonizer/build.gradle.kts
@@ -12,6 +12,10 @@ val mavenCompileScope by configurations.creating {
         .addMapping(0, this, COMPILE)
 }
 
+configurations {
+    runtimeOnly.get().extendsFrom(compileOnly.get())
+}
+
 description = "Kotlin KLIB Library Commonizer"
 
 dependencies {
@@ -25,13 +29,10 @@ dependencies {
     // This dependency is necessary to keep the right dependency record inside of POM file:
     mavenCompileScope(project(":kotlin-compiler"))
 
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
 
-    testCompile(commonDep("junit:junit"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":native:frontend.native"))
-
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(commonDep("junit:junit"))
+    testImplementation(projectTests(":compiler:tests-common"))
 }
 
 val runCommonizer by tasks.registering(NoDebugJavaExec::class) {
@@ -40,10 +41,7 @@ val runCommonizer by tasks.registering(NoDebugJavaExec::class) {
 }
 
 sourceSets {
-    "main" {
-        projectDefault()
-        runtimeClasspath += configurations.compileOnly
-    }
+    "main" { projectDefault() }
     "test" { projectDefault() }
 }