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

Build: Change builtins artifact configuration to default

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-01-16 18:22:04 +03:00
parent 0d8c779190
commit 46d9d5456f
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/builtins/build.gradle.kts
+1 -3
View File
@@ -8,8 +8,6 @@ plugins {
val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src")
val builtinsNative = fileFrom(rootDir, "core", "builtins", "native")
val builtins by configurations.creating
val serialize by tasks.creating(NoDebugJavaExec::class) {
val outDir = "$buildDir/$name"
val inDirs = arrayOf(builtinsSrc, builtinsNative)
@@ -34,4 +32,4 @@ val assemble by tasks.getting {
dependsOn(serialize)
}
artifacts.add(builtins.name, builtinsJar)
artifacts.add("default", builtinsJar)
include/kotlin-compiler/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
compile(project(module)) { isTransitive = false }
}
fatJarContents(project(":core:builtins", configuration = "builtins"))
fatJarContents(project(":core:builtins"))
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
prepare/compiler/build.gradle.kts
+1 -1
View File
@@ -71,7 +71,7 @@ dependencies {
trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
fatJarContents(project(":core:builtins", configuration = "builtins"))
fatJarContents(project(":core:builtins"))
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
prepare/compiler/build.gradle.kts.182
+1 -1
View File
@@ -71,7 +71,7 @@ dependencies {
trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
fatJarContents(project(":core:builtins", configuration = "builtins"))
fatJarContents(project(":core:builtins"))
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
prepare/compiler/build.gradle.kts.as34
+1 -1
View File
@@ -71,7 +71,7 @@ dependencies {
trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
fatJarContents(project(":core:builtins", configuration = "builtins"))
fatJarContents(project(":core:builtins"))
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
prepare/idea-plugin/build.gradle.kts
+1 -1
View File
@@ -75,7 +75,7 @@ val sideJars by configurations.creating
dependencies {
packedJars(protobufFull())
packedJars(project(":core:builtins", configuration = "builtins"))
packedJars(project(":core:builtins"))
sideJars(project(":kotlin-script-runtime"))
sideJars(project(":kotlin-stdlib"))
sideJars(project(":kotlin-stdlib-jdk7"))