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 = compilerShadowJar(taskName) { configureEmbeddableCompilerRelocation()