diff --git a/build.gradle.kts b/build.gradle.kts index 5fa4cc12e0d..d48a27b71eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,9 +7,11 @@ buildscript { // kotlin-stdlib external dependency with local project :kotlin-stdlib in kotlinCompilerClasspath configuration. // see also configureCompilerClasspath@ val bootstrapCompilerClasspath by configurations.creating + val bootstrapBuildToolsApiClasspath by configurations.creating dependencies { bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion)) + bootstrapBuildToolsApiClasspath(kotlin("build-tools-impl", bootstrapKotlinVersion)) classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") } diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts index 3fd30e4a9a1..7082f8db553 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts @@ -51,6 +51,10 @@ afterEvaluate { configurations.findByName("kotlinCompilerClasspath")?.let { dependencies.add(it.name, files(bootstrapCompilerClasspath)) } + val bootstrapBuildToolsApiClasspath by rootProject.buildscript.configurations + configurations.findByName("kotlinBuildToolsApiClasspath")?.let { + dependencies.add(it.name, files(bootstrapBuildToolsApiClasspath)) + } configurations.findByName("kotlinCompilerPluginClasspath") ?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")