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

Move common idea and compiler parts of the scripting plugin to the new jar

Browse Source
This commit is contained in:
Ilya Chernikov
2019-03-20 19:29:18 +01:00
parent af63fcb3be
commit c56382a62b
54 changed files with 141 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-idea/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
compile(project(":kotlin-scripting-compiler"))
compile(project(":kotlin-scripting-impl"))
compile(project(":kotlin-scripting-intellij"))
compileOnly(project(":idea:idea-gradle"))
compileOnly(project(":idea:idea-core"))
plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt
+2 -2
View File
@@ -8,13 +8,13 @@ package org.jetbrains.kotlin.scripting.idea.plugin
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler
import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCommandLineProcessor
import org.jetbrains.kotlin.scripting.shared.KOTLIN_SCRIPTING_PLUGIN_ID
import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
import java.io.File
class ScriptingGradleProjectImportHandler : GradleProjectImportHandler {
val compilerPluginId = ScriptingCommandLineProcessor.PLUGIN_ID
val compilerPluginId = KOTLIN_SCRIPTING_PLUGIN_ID
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",