Revert "[Build] Switch Gradle plugins compilation to BTA"
This reverts commit 74b9b932ee940f2643f85204786dd2bcba1bd82f.
diff --git a/build.gradle.kts b/build.gradle.kts
index 68739ce..453231e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,12 +9,10 @@
// see also configureCompilerClasspath@
val bootstrapCompilerClasspath by configurations.creating
val bootstrapBuildToolsApiClasspath by configurations.creating
- val gradlePluginsBuildToolsApiClasspath by configurations.creating
dependencies {
bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
bootstrapBuildToolsApiClasspath(kotlin("build-tools-impl", bootstrapKotlinVersion))
- gradlePluginsBuildToolsApiClasspath(kotlin("build-tools-impl", libs.versions.kotlin.`for`.gradle.plugins.compilation.get()))
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
}
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
index 13da020..4cb6d6a 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
@@ -584,14 +584,6 @@
)
}
}
- project.extra["kotlin.compiler.runViaBuildToolsApi"] = true
- afterEvaluate {
- val gradlePluginsBuildToolsApiClasspath by rootProject.buildscript.configurations
- configurations.findByName("kotlinBuildToolsApiClasspath")?.let {
- it.dependencies.clear()
- dependencies.add(it.name, files(gradlePluginsBuildToolsApiClasspath))
- }
- }
}
// Will allow combining outputs of multiple SourceSets
