Fix dependencies of kotlin-compiler(+embeddable), remove them from kotlin-maven-plugin
This commit is contained in:
committed by
Ilya Chernikov
parent
ec2e7bb43c
commit
403f2c6f99
@@ -40,21 +40,6 @@
|
|||||||
<artifactId>kotlin-compiler</artifactId>
|
<artifactId>kotlin-compiler</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-stdlib</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-reflect</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-script-runtime</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy-all</artifactId>
|
<artifactId>groovy-all</artifactId>
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
`java`
|
||||||
|
}
|
||||||
|
|
||||||
val compilerJar by configurations.creating
|
val compilerJar by configurations.creating
|
||||||
|
|
||||||
val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
|
val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
|
||||||
@@ -30,7 +34,13 @@ val packagesToRelocate =
|
|||||||
"org.fusesource")
|
"org.fusesource")
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
val compile by configurations
|
||||||
|
|
||||||
compilerJar(projectDist(":kotlin-compiler"))
|
compilerJar(projectDist(":kotlin-compiler"))
|
||||||
|
|
||||||
|
compile(project(":kotlin-stdlib"))
|
||||||
|
compile(project(":kotlin-script-runtime"))
|
||||||
|
compile(project(":kotlin-reflect"))
|
||||||
}
|
}
|
||||||
|
|
||||||
runtimeJar(task<ShadowJar>("embeddable")) {
|
runtimeJar(task<ShadowJar>("embeddable")) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
`java-base`
|
`java`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build
|
// 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 fatJar by configurations.creating
|
||||||
val compilerJar by configurations.creating
|
val compilerJar by configurations.creating
|
||||||
val archives by configurations
|
val archives by configurations
|
||||||
|
val compile by configurations
|
||||||
|
|
||||||
val compilerBaseName = name
|
val compilerBaseName = name
|
||||||
|
|
||||||
@@ -90,6 +91,10 @@ dependencies {
|
|||||||
proguardLibraryJars(projectDist(":kotlin-stdlib"))
|
proguardLibraryJars(projectDist(":kotlin-stdlib"))
|
||||||
proguardLibraryJars(projectDist(":kotlin-script-runtime"))
|
proguardLibraryJars(projectDist(":kotlin-script-runtime"))
|
||||||
proguardLibraryJars(projectDist(":kotlin-reflect"))
|
proguardLibraryJars(projectDist(":kotlin-reflect"))
|
||||||
|
|
||||||
|
compile(project(":kotlin-stdlib"))
|
||||||
|
compile(project(":kotlin-script-runtime"))
|
||||||
|
compile(project(":kotlin-reflect"))
|
||||||
}
|
}
|
||||||
|
|
||||||
val packCompiler by task<ShadowJar> {
|
val packCompiler by task<ShadowJar> {
|
||||||
|
|||||||
Reference in New Issue
Block a user