azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gradle tests after renaming scripting libs and plugin

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -482,7 +482,7 @@ allprojects {
} }
configurations.findByName("kotlinCompilerPluginClasspath") 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") apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt
+1 -1
View File
@@ -220,7 +220,7 @@ fun Configuration.discoverScriptExtensionsFiles() =
class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> { class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
companion object { 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_OPTION = "script-definitions"
val SCRIPT_DEFINITIONS_CLASSPATH_OPTION = "script-definitions-classpath" val SCRIPT_DEFINITIONS_CLASSPATH_OPTION = "script-definitions-classpath"
plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class ScriptingGradleProjectImportHandler : GradleProjectImportHandler {
val gradlePluginJars = listOf( val gradlePluginJars = listOf(
"scripting-gradle", // obsolete artifact name, only for compatibility with 1.2.5x, where it was introduced (and immediately dropped afterwards) "scripting-gradle", // obsolete artifact name, only for compatibility with 1.2.5x, where it was introduced (and immediately dropped afterwards)
"scripting-compiler", "scripting-compiler",
"scripting-compiler-embeddable" "scripting-compiler-unshaded"
) )
override fun importBySourceSet( override fun importBySourceSet(