Fix gradle tests after renaming scripting libs and plugin

This commit is contained in:
Ilya Chernikov
2020-05-26 20:24:15 +02:00
parent 9b7a95b05c
commit a1c173733c
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -482,7 +482,7 @@ allprojects {
}
configurations.findByName("kotlinCompilerPluginClasspath")
?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler")
}
apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
@@ -220,7 +220,7 @@ fun Configuration.discoverScriptExtensionsFiles() =
class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
companion object {
const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler-embeddable"
const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler"
val SCRIPT_DEFINITIONS_OPTION = "script-definitions"
val SCRIPT_DEFINITIONS_CLASSPATH_OPTION = "script-definitions-classpath"
@@ -18,7 +18,7 @@ class ScriptingGradleProjectImportHandler : GradleProjectImportHandler {
val gradlePluginJars = listOf(
"scripting-gradle", // obsolete artifact name, only for compatibility with 1.2.5x, where it was introduced (and immediately dropped afterwards)
"scripting-compiler",
"scripting-compiler-embeddable"
"scripting-compiler-unshaded"
)
override fun importBySourceSet(