Refactor build to make manifest specification less error-prone.

Use legacy implementation title in manifest of JS stdlib for now.

Change the way common jvm project configurations is applied.
Add missing artifacts to common libraries.
This commit is contained in:
Ilya Gorbunov
2017-03-28 23:43:56 +03:00
parent 325ebfbd5f
commit 92ef26606b
13 changed files with 81 additions and 87 deletions
@@ -13,6 +13,10 @@ buildscript {
}
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'kotlin'
configureJvmProject(project)
def core = "${rootDir}/../core"
def annotationsSrc = "${buildDir}/annotations"
@@ -79,6 +83,9 @@ kotlin.experimental.coroutines "enable"
task reflectShadowJar(type: ShadowJar) {
classifier = 'shadow'
version = null
manifestAttributes(manifest, project, 'Main')
manifest.attributes 'Class-Path': 'kotlin-runtime.jar' // TODO replace soon with 'kotlin-stdlib.jar'
from (sourceSets.main.output)
from ("${core}/descriptor.loader.java/src") {
include 'META-INF/services/**'
+5 -2
View File
@@ -1,5 +1,8 @@
description 'Kotlin Runtime (deprecated, use koltin-stdlib artifact instead)'
description 'Kotlin Runtime'
apply plugin: 'kotlin'
configureJvmProject(project)
dependencies {
compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
@@ -20,7 +23,7 @@ sourceSets {
}
jar {
manifestAttributes(manifest, project, 'Core')
manifestAttributes(manifest, project, 'Main')
from("${rootDir}/../dist/builtins")
}
+5 -2
View File
@@ -1,6 +1,9 @@
description 'Kotlin Script Runtime'
apply plugin: 'kotlin'
configureJvmProject(project)
dependencies {
compileOnly project(':kotlin-stdlib')
}
@@ -14,7 +17,7 @@ sourceSets {
}
jar {
manifestAttributes(manifest, project, 'Core')
manifestAttributes(manifest, project, 'Main')
}
artifacts {