diff --git a/build.gradle.kts b/build.gradle.kts index dd40fcd0c5d..5e3162c0345 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index 86a33c88eb0..560132f0922 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -220,7 +220,7 @@ fun Configuration.discoverScriptExtensionsFiles() = class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin { 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" diff --git a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt index a091a3276e1..a702b18d9e0 100644 --- a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt +++ b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt @@ -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(