From 0a33eef5189f0cbbc77da5ca9d094ba9c36eb84a Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Wed, 15 Mar 2023 17:08:24 +0100
Subject: [PATCH] [build] Fix weird dependencies management

kotlin-gradle-plugin-integration-tests on runtime uses relocated
compiler jars. A special handling is required to support this.

Looks like 'kotlin-gradle-plugin-test-utils' was meant to help
here somehow, but was accidentally broken at some point. It went
unnoticed because not much classes from transitive dependencies
of 'kotlin-gradle-plugin-test-utils' were used.

The change in this commit still leaves a few questions about this
configuration, but at leats it makes it possible to use compiler
classes (e.g. KotlinTestUtils)
---
 .../kotlin-gradle-plugin-integration-tests/build.gradle.kts     | 2 +-
 .../kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 85d2f381b4d..eb1cfb37a90 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -78,7 +78,7 @@ dependencies {
     // testCompileOnly dependency on non-shaded artifacts is needed for IDE support
     // testRuntimeOnly on shaded artifact is needed for running tests with shaded compiler
     testCompileOnly(project(":kotlin-gradle-plugin-test-utils-embeddable"))
-    testRuntimeOnly(project(":kotlin-gradle-plugin-test-utils-embeddable"))
+    testRuntimeOnly(project(":kotlin-gradle-plugin-test-utils-embeddable")) { isTransitive = false }
 
     testImplementation(project(path = ":examples:annotation-processor-example"))
     testImplementation(kotlinStdlib("jdk8"))
diff --git a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
index 4d41ba81cf2..4615012c338 100644
--- a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
@@ -21,6 +21,8 @@ dependencies {
         api(projectTests(projectName)) { isTransitive = false }
         embedded(projectTests(projectName)) { isTransitive = false }
     }
+
+    embedded(intellijJavaRt())
 }
 
 runtimeJar(rewriteDefaultJarDepsToShadedCompiler())