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:
@@ -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/**'
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user