diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index 9b165e627a6..6e6b3823b79 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -40,21 +40,6 @@ kotlin-compiler ${project.version} - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-reflect - ${project.version} - - - org.jetbrains.kotlin - kotlin-script-runtime - ${project.version} - org.codehaus.groovy groovy-all diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 0ec5d583fda..5704d93d80d 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -13,6 +13,10 @@ buildscript { } } +plugins { + `java` +} + val compilerJar by configurations.creating val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin" @@ -30,7 +34,13 @@ val packagesToRelocate = "org.fusesource") dependencies { + val compile by configurations + compilerJar(projectDist(":kotlin-compiler")) + + compile(project(":kotlin-stdlib")) + compile(project(":kotlin-script-runtime")) + compile(project(":kotlin-reflect")) } runtimeJar(task("embeddable")) { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 8a566bd427d..a2a78745982 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -18,7 +18,7 @@ buildscript { } plugins { - `java-base` + `java` } // Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build @@ -32,6 +32,7 @@ val proguardLibraryJars by configurations.creating val fatJar by configurations.creating val compilerJar by configurations.creating val archives by configurations +val compile by configurations val compilerBaseName = name @@ -90,6 +91,10 @@ dependencies { proguardLibraryJars(projectDist(":kotlin-stdlib")) proguardLibraryJars(projectDist(":kotlin-script-runtime")) proguardLibraryJars(projectDist(":kotlin-reflect")) + + compile(project(":kotlin-stdlib")) + compile(project(":kotlin-script-runtime")) + compile(project(":kotlin-reflect")) } val packCompiler by task {