Merge scripting-impl to scripting-compiler-impl module...

to continue merging with the branch with further scripting refactorings

plugins/scripting/scripting-compiler-embeddable/build.gradle.kts

@@ -6,7 +6,6 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
 
 val packedJars by configurations.creating
 dependencies {
-    packedJars(project(":kotlin-scripting-impl")) { isTransitive = false }
     packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
     runtime(project(":kotlin-scripting-compiler-impl-embeddable"))
     runtime(kotlinStdlib())

plugins/scripting/scripting-compiler-impl/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
 dependencies {
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
+    compileOnly(project(":compiler:frontend.script"))
     compileOnly(project(":compiler:psi"))
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(project(":compiler:cli"))
@@ -37,15 +38,15 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
+        languageVersion = "1.2"
+        apiVersion = "1.2"
         freeCompilerArgs += "-Xskip-metadata-version-check"
     }
 }
 
 publish()
 
-val jar = runtimeJar {}
+runtimeJar()
 sourcesJar()
 javadocJar()
 

plugins/scripting/scripting-compiler/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-impl"))
+    compile(project(":kotlin-scripting-compiler-impl"))
     compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

plugins/scripting/scripting-idea/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-scripting-impl"))
+    compile(project(":kotlin-scripting-compiler-impl"))
     compile(project(":kotlin-scripting-intellij"))
     compileOnly(project(":idea:idea-gradle"))
     compileOnly(project(":idea:idea-core"))

plugins/scripting/scripting-impl/build.gradle.kts

@@ -1,46 +0,0 @@
-
-description = "Kotlin Scripting Implementation - shared part"
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":compiler:frontend.java"))
-    compileOnly(project(":compiler:frontend.script"))
-    compileOnly(project(":compiler:psi"))
-    compileOnly(project(":compiler:cli-common"))
-    compile(project(":kotlin-scripting-common"))
-    compile(project(":kotlin-scripting-jvm"))
-    compile(kotlinStdlib())
-    compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" { projectDefault() }
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
-    kotlinOptions {
-        languageVersion = "1.2"
-        apiVersion = "1.2"
-        freeCompilerArgs += "-Xskip-metadata-version-check"
-    }
-}
-
-publish()
-
-runtimeJar()
-sourcesJar()
-javadocJar()
-
-dist()
-
-projectTest {
-    workingDir = rootDir
-}