Fix gradle tests after renaming scripting libs and plugin
This commit is contained in:
+1
-1
@@ -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")
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user