diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/script/scriptTestUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/script/scriptTestUtil.kt index 69e5c7b145f..67b4e062e20 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/script/scriptTestUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/script/scriptTestUtil.kt @@ -15,7 +15,7 @@ fun loadScriptingPlugin(configuration: CompilerConfiguration) { val pluginClasspath = with (PathUtil) { listOf( KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR, - KOTLIN_SCRIPTING_IMPL_JAR, + KOTLIN_SCRIPTING_COMPILER_IMPL_JAR, KOTLIN_SCRIPTING_COMMON_JAR, KOTLIN_SCRIPTING_JVM_JAR ).map { File(libPath, it).path } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCustomScriptCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCustomScriptCodegenTest.kt index 3f3cf3e0044..24c530f6ec6 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCustomScriptCodegenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCustomScriptCodegenTest.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMMON_JAR +import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMPILER_IMPL_JAR import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR -import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_IMPL_JAR import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_JVM_JAR import org.junit.Assert import java.io.File @@ -60,7 +60,7 @@ abstract class AbstractCustomScriptCodegenTest : CodegenTestCase() { File(TestScriptWithReceivers::class.java.protectionDomain.codeSource.location.toURI().path) + with(PathUtil.kotlinPathsForDistDirectory) { arrayOf( - KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR, KOTLIN_SCRIPTING_IMPL_JAR, + KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR, KOTLIN_SCRIPTING_COMPILER_IMPL_JAR, KOTLIN_SCRIPTING_COMMON_JAR, KOTLIN_SCRIPTING_JVM_JAR ).mapNotNull { File(libPath, it).takeIf { it.exists() } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CustomScriptCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/CustomScriptCodegenTest.kt index 34652156e94..23607db9c47 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CustomScriptCodegenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CustomScriptCodegenTest.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMMON_JAR +import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMPILER_IMPL_JAR import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR -import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_IMPL_JAR import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_SCRIPTING_JVM_JAR import java.io.File import kotlin.reflect.KClass @@ -50,7 +50,7 @@ class CustomScriptCodegenTest : CodegenTestCase() { File(TestScriptWithReceivers::class.java.protectionDomain.codeSource.location.toURI().path) + with(PathUtil.kotlinPathsForDistDirectory) { arrayOf( - KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR, KOTLIN_SCRIPTING_IMPL_JAR, + KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR, KOTLIN_SCRIPTING_COMPILER_IMPL_JAR, KOTLIN_SCRIPTING_COMMON_JAR, KOTLIN_SCRIPTING_JVM_JAR ).mapNotNull { File(libPath, it).also { assertTrue("$it not found", it.exists()) } } } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt index 2c8cdd261e6..0bc89484914 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt @@ -93,7 +93,7 @@ interface KotlinPaths { Trove4j(PathUtil.TROVE4J_NAME), Compiler(PathUtil.KOTLIN_COMPILER_NAME), ScriptingPlugin(PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME), - ScriptingImpl(PathUtil.KOTLIN_SCRIPTING_IMPL_NAME), + ScriptingCompilerImpl(PathUtil.KOTLIN_SCRIPTING_COMPILER_IMPL_NAME), ScriptingLib(PathUtil.KOTLIN_SCRIPTING_COMMON_NAME), ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME), CoroutinesCore(PathUtil.KOTLINX_COROUTINES_CORE_NAME), @@ -102,7 +102,7 @@ interface KotlinPaths { enum class ClassPaths(val contents: List = emptyList()) { Empty(), Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j), - CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib) + CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingCompilerImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib) ; constructor(vararg jars: Jar) : this(jars.asList()) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 9156c7f361f..eb25d600204 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -90,7 +90,7 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-impl")) + testRuntime(project(":kotlin-scripting-compiler-impl")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index a3867cd45d9..70b584c00d4 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compile(project(":idea:ide-common")) compile(project(":idea:idea-jps-common")) compile(project(":plugins:android-extensions-compiler")) - compile(project(":kotlin-scripting-impl")) + compile(project(":kotlin-scripting-compiler-impl")) compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false } compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt index 674a19f3da7..ca8f2870517 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt @@ -24,7 +24,6 @@ internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar" internal const val TROVE4J_JAR = "trove4j.jar" internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler.jar" internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler-embeddable.jar" -internal const val KOTLIN_SCRIPTING_IMPL_JAR = "kotlin-scripting-impl.jar" internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl.jar" internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl-embeddable.jar" internal const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar" @@ -205,7 +204,6 @@ object KotlinJars { ) val kotlinScriptingJars = if (withScripting) listOf( KOTLIN_SCRIPTING_COMPILER_JAR, - KOTLIN_SCRIPTING_IMPL_JAR, KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR, KOTLIN_SCRIPTING_COMPILER_IMPL_JAR, KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR, diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts index 5450f0a1973..dfa579f5ca0 100644 --- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts +++ b/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()) diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index 294943fc9a3..54916f661ce 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/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> { 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() diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt similarity index 100% rename from plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 173b122c138..d5132d40008 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/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") } diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts index 21e196a902d..cf205b56d82 100644 --- a/plugins/scripting/scripting-idea/build.gradle.kts +++ b/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")) diff --git a/plugins/scripting/scripting-impl/build.gradle.kts b/plugins/scripting/scripting-impl/build.gradle.kts deleted file mode 100644 index b666ff918de..00000000000 --- a/plugins/scripting/scripting-impl/build.gradle.kts +++ /dev/null @@ -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> { - kotlinOptions { - languageVersion = "1.2" - apiVersion = "1.2" - freeCompilerArgs += "-Xskip-metadata-version-check" - } -} - -publish() - -runtimeJar() -sourcesJar() -javadocJar() - -dist() - -projectTest { - workingDir = rootDir -} diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 7cc4e26c5ab..dae9023bc51 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -129,7 +129,7 @@ dependencies { libraries(project(":kotlin-script-runtime")) libraries(project(":kotlin-script-util")) libraries(project(":kotlin-scripting-common")) - libraries(project(":kotlin-scripting-impl")) + libraries(project(":kotlin-scripting-compiler-impl")) libraries(project(":kotlin-scripting-intellij")) libraries(project(":kotlin-scripting-jvm")) diff --git a/settings.gradle b/settings.gradle index f7b87f87637..cd5691b6a6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -173,7 +173,6 @@ include ":kotlin-build-common", ":kotlin-scripting-jvm-host", ":kotlin-scripting-jvm-host-embeddable", ":kotlin-scripting-intellij", - ":kotlin-scripting-impl", ":kotlin-scripting-compiler", ":kotlin-scripting-compiler-embeddable", ":kotlin-scripting-compiler-impl", @@ -339,7 +338,6 @@ project(':kotlin-scripting-jvm').projectDir = "$rootDir/libraries/scripting/jvm" project(':kotlin-scripting-jvm-host').projectDir = "$rootDir/libraries/scripting/jvm-host" as File project(':kotlin-scripting-jvm-host-embeddable').projectDir = "$rootDir/libraries/scripting/jvm-host-embeddable" as File project(':kotlin-scripting-intellij').projectDir = "$rootDir/libraries/scripting/intellij" as File -project(':kotlin-scripting-impl').projectDir = "$rootDir/plugins/scripting/scripting-impl" as File project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File project(':kotlin-scripting-compiler-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-compiler-embeddable" as File project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index b1e352c7904..435bb523bae 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -99,7 +99,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-impl")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler-impl")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }