From 0ef6f2fa5bc52ada6eca4875f985dee6c00928b1 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 18 Dec 2017 09:44:45 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2-20171217.163053-69 kotlinScriptRuntimeVersion=1.2-20171217.163109-69 kotlinStdLibVersion=1.2-20171217.163113-69 kotlinReflectVersion=1.2-20171217.163105-69 kotlinStdLibJdk8Version=1.2-20171217.163118-69 kotlinGradlePluginVersion=1.2-20171217.163101-69 --- dependencies/upload.gradle | 4 ++-- gradle.properties | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies/upload.gradle b/dependencies/upload.gradle index 7a8ae3872bb..228e031dabf 100644 --- a/dependencies/upload.gradle +++ b/dependencies/upload.gradle @@ -29,7 +29,7 @@ task generatePom(type: DefaultTask) { inputs.file(originalPom) def (_, artifactIdString, versionString) = gradle.startParameter.projectProperties.module.tokenize(':') - def versionPath = versionString //"${versionString.tokenize('-')[0]}-SNAPSHOT" + def versionPath = "${versionString.tokenize('-')[0]}-SNAPSHOT" def newPom = file("${temporaryDir.canonicalPath}/$artifactIdString-${versionString}.pom") outputs.file(newPom) @@ -69,7 +69,7 @@ bintray { def (groupId, artifactId, version) = gradle.startParameter.projectProperties.module.tokenize(':') def groupPath = groupId.replace('.', '/') def artifactPath = artifactId - def versionPath = version // for sonatype "${version.tokenize('-')[0]}-SNAPSHOT" + def versionPath = "${version.tokenize('-')[0]}-SNAPSHOT" from project.files(gradle.startParameter.projectProperties.jar) from project.files(gradle.startParameter.projectProperties.src) from project.files(gradle.startParameter.projectProperties.doc) diff --git a/gradle.properties b/gradle.properties index 323dc36226f..f6398377373 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,14 +23,14 @@ testDataVersion=1226829:id kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev -kotlinCompilerVersion=1.2.20-dev-773 -kotlinScriptRuntimeVersion=1.2.20-dev-773 -kotlinStdLibVersion=1.2.20-dev-773 -kotlinReflectVersion=1.2.20-dev-773 +kotlinCompilerVersion=1.2-20171217.163053-69 +kotlinScriptRuntimeVersion=1.2-20171217.163109-69 +kotlinStdLibVersion=1.2-20171217.163113-69 +kotlinReflectVersion=1.2-20171217.163105-69 konanVersion=0.5 org.gradle.jvmargs='-Dfile.encoding=UTF-8' ## # required for performance mesuarement tasks -kotlinStdLibJdk8Version=1.2.20-dev-773 -kotlinGradlePluginVersion=1.2.20-dev-773 +kotlinStdLibJdk8Version=1.2-20171217.163118-69 +kotlinGradlePluginVersion=1.2-20171217.163101-69