[kotlin compiler][update] 1.1-20171004.235336-906

kotlin-script-runtime: 1.1-20171004.235353-597
kotlin-stdlib: 1.1-20171004.235357-905
kotlin-reflect: 1.1-20171004.235348-905
kotlin-stlib-jdk8: 1.1-20171004.235402-815
kotlin-gradle-plugin: 1.1-20171004.235345-884
This commit is contained in:
Vasily Levchenko
2017-10-11 12:12:20 +03:00
committed by Vasily Levchenko
parent 596c8c086c
commit 6457e97364
8 changed files with 95 additions and 17 deletions
+27 -5
View File
@@ -44,8 +44,8 @@ allprojects {
// make Gradle aware of this to avoid multiple Kotlin runtimes in classpath:
resolutionStrategy.dependencySubstitution {
substitute module('org.jetbrains.kotlin:kotlin-runtime') with module(kotlinCompilerModule)
substitute module('org.jetbrains.kotlin:kotlin-stdlib') with module(kotlinCompilerModule)
substitute module('org.jetbrains.kotlin:kotlin-reflect') with module(kotlinCompilerModule)
substitute module('org.jetbrains.kotlin:kotlin-stdlib') with module(kotlinStdLibModule)
substitute module('org.jetbrains.kotlin:kotlin-reflect') with module(kotlinReflectModule)
}
// TODO: probably we should use kotlin-compiler without bundled runtime
}
@@ -120,6 +120,11 @@ kotlinNativeInterop {
configurations {
kotlin_compiler_jar
kotlin_stdlib_jar
kotlin_reflect_jar
kotlin_script_runtime_jar
cli_bcRuntime.extendsFrom compilerRuntime
cli_bc {
@@ -128,6 +133,10 @@ configurations {
}
dependencies {
kotlin_compiler_jar "$kotlinCompilerModule@jar"
kotlin_stdlib_jar "$kotlinStdLibModule@jar"
kotlin_reflect_jar "$kotlinReflectModule@jar"
kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar"
compilerCompile "com.google.protobuf:protobuf-java:${protobufVersion}"
@@ -220,14 +229,27 @@ jar {
dependsOn ':runtime:hostRuntime', 'external_jars'
}
def externalJars = ['compiler', 'stdlib', 'reflect', 'script_runtime']
externalJars.each { arg ->
def jar = arg.replace('_', '-') // :(
task ("${arg}Copy", type:Copy) {
from configurations.getByName("kotlin_${arg}_jar") {
include "kotlin-${jar}*.jar"
rename "kotlin-${jar}(.*).jar", "kotlin-${jar}.jar"
into 'build/external_jars'
}
}
}
task external_jars(type: Copy) {
dependsOn externalJars.collect{"${it}Copy"}
from configurations.compilerCompile {
include "protobuf-java-${protobufVersion}.jar"
include 'kotlin-compiler*.jar'
rename 'kotlin-compiler(.*).jar', 'kotlin-compiler.jar'
into 'build/external_jars'
}
}