Switching library projects to java 8 compilation with exceptions for stdlib/runtime/reflect/test
This commit is contained in:
@@ -15,7 +15,7 @@ buildscript {
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
configureJvmProject(project)
|
||||
configureJvm6Project(project)
|
||||
configurePublishing(project)
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@ configurations {
|
||||
proguardDeps
|
||||
shadows
|
||||
compileOnly.extendsFrom(shadows)
|
||||
mainJar
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -174,6 +175,7 @@ task relocatedSourcesJar(type: Jar) {
|
||||
def artifactJar = [file: file(outputJarPath), builtBy: proguard, name: archivesBaseName]
|
||||
|
||||
artifacts {
|
||||
mainJar artifactJar
|
||||
runtime artifactJar
|
||||
archives artifactJar
|
||||
archives relocatedSourcesJar
|
||||
|
||||
@@ -2,7 +2,7 @@ description 'Kotlin Runtime (deprecated, use koltin-stdlib artifact instead)'
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
configureJvmProject(project)
|
||||
configureJvm6Project(project)
|
||||
configurePublishing(project)
|
||||
|
||||
dependencies {
|
||||
|
||||
@@ -2,13 +2,17 @@ description 'Kotlin Script Runtime'
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
configureJvmProject(project)
|
||||
configureJvm6Project(project)
|
||||
configurePublishing(project)
|
||||
|
||||
dependencies {
|
||||
compileOnly project(':kotlin-stdlib')
|
||||
}
|
||||
|
||||
configurations {
|
||||
mainJar
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
kotlin {
|
||||
@@ -24,9 +28,9 @@ jar {
|
||||
artifacts {
|
||||
archives sourcesJar
|
||||
archives javadocJar
|
||||
mainJar jar
|
||||
}
|
||||
|
||||
|
||||
dist {
|
||||
from (jar, sourcesJar)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user