From 62cadde3e631603485ebb3bcd256c6c533c9d55b Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Tue, 26 Jul 2022 13:45:01 +0200
Subject: [PATCH] Drop kotlin-reflect -> kotlin-reflect-api dependency
 substitution

Review: https://jetbrains.team/p/kt/reviews/6753

This dependency substitution was introduced in
5c99243c107d8897f627f917b0dc81d7f368a4aa as a way to fight against
non-incremental compilations. Now it's not needed anymore as the
dependency on kotlin-reflect was changed to binary dependency just a few
commits ago.
---
 .../kotlin/common-configuration.gradle.kts     |  2 --
 buildSrc/src/main/kotlin/embeddable.kt         | 18 ------------------
 2 files changed, 20 deletions(-)

diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
index 8f9a29cbfbb..adb1c4c9ca5 100644
--- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
@@ -87,8 +87,6 @@ fun Project.configureJavaCompile() {
 
 fun Project.configureJavaBasePlugin() {
     plugins.withId("java-base") {
-        project.configureShadowJarSubstitutionInCompileClasspath()
-
         fun File.toProjectRootRelativePathOrSelf() = (relativeToOrNull(rootDir)?.takeUnless { it.startsWith("..") } ?: this).path
 
         fun FileCollection.printClassPath(role: String) =
diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt
index 3ccd4a8ad79..c3384b46efa 100644
--- a/buildSrc/src/main/kotlin/embeddable.kt
+++ b/buildSrc/src/main/kotlin/embeddable.kt
@@ -92,24 +92,6 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un
     }
 }
 
-fun Project.configureShadowJarSubstitutionInCompileClasspath() {
-    val substitutionMap = mapOf(":kotlin-reflect" to ":kotlin-reflect-api")
-
-    fun configureSubstitution(substitution: DependencySubstitution) {
-        val requestedProject = (substitution.requested as? ProjectComponentSelector)?.projectPath ?: return
-        val replacementProject = substitutionMap[requestedProject] ?: return
-        substitution.useTarget(project(replacementProject), "Non-default shadow jars should not be used in compile classpath")
-    }
-
-    sourceSets.all {
-        for (configName in listOf(compileOnlyConfigurationName, compileClasspathConfigurationName)) {
-            configurations.getByName(configName).resolutionStrategy.dependencySubstitution {
-                all(::configureSubstitution)
-            }
-        }
-    }
-}
-
 fun Project.embeddableCompiler(taskName: String = "embeddable", body: ShadowJar.() -> Unit = {}): TaskProvider<ShadowJar> =
     compilerShadowJar(taskName) {
         configureEmbeddableCompilerRelocation()