diff --git a/dependencies/upload.gradle b/dependencies/upload.gradle index fd902da0ce6..39851c03bc5 100644 --- a/dependencies/upload.gradle +++ b/dependencies/upload.gradle @@ -16,7 +16,11 @@ buildscript { apply plugin: 'com.jfrog.bintray' def versionMapping = [ - 'kotlin-script-runtime' : kotlinScriptRuntimeVersion + 'kotlin-script-runtime' : kotlinScriptRuntimeVersion, + 'kotlin-compiler' : kotlinVersion, + 'kotlin-stdlib' : kotlinStdLibVersion, + 'kotlin-reflect' : kotlinReflectVersion, + 'kotlin-stdlib-jre8' : kotlinStdLibJdk8Version ] // Hack kotlin-compiler pom-file to resolve the dependency correctly. @@ -65,7 +69,7 @@ bintray { def (groupId, artifactId, version) = gradle.startParameter.projectProperties.module.tokenize(':') def groupPath = groupId.replace('.', '/') def artifactPath = artifactId - def versionPath = "$version" //TODO: snapshots? + 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 aba50f615db..ccb738a8de7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,14 +23,14 @@ testDataVersion=1067176: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 -kotlinVersion=1.2.0-rc-39 -kotlinScriptRuntimeVersion=1.2.0-rc-39 -kotlinStdLibVersion=1.2.0-rc-39 -kotlinReflectVersion=1.2.0-rc-39 +kotlinVersion=1.2-20171110.225330-21 +kotlinScriptRuntimeVersion=1.2-20171110.225348-21 +kotlinStdLibVersion=1.2-20171110.225351-21 +kotlinReflectVersion=1.2-20171110.225343-21 konanVersion=0.4 org.gradle.jvmargs='-Dfile.encoding=UTF-8' ## # required for performance mesuarement tasks -kotlinStdLibJdk8Version=1.2.0-rc-39 -kotlinGradlePluginVersion=1.2.0-rc-39 +kotlinStdLibJdk8Version=1.2-20171110.225357-21 +kotlinGradlePluginVersion=1.2-20171110.225340-21