azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kotlin compiler][update] 1.2-20171110.225330-21

Browse Source 
script runtime : 1.2-20171110.225348-21
stdlib         : 1.2-20171110.225351-21
reflect        : 1.2-20171110.225343-21
stdlib-jdk8    : 1.2-20171110.225357-21
gradle plugin  : 1.2-20171110.225340-21
This commit is contained in:
Vasily Levchenko
2017-11-13 13:48:28 +03:00
committed by Vasily Levchenko
parent afe0780d28
commit 9d7ed9d153
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dependencies/upload.gradle
Vendored
+6 -2
View File
@@ -16,7 +16,11 @@ buildscript {
apply plugin: 'com.jfrog.bintray' apply plugin: 'com.jfrog.bintray'
def versionMapping = [ 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. // 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 (groupId, artifactId, version) = gradle.startParameter.projectProperties.module.tokenize(':')
def groupPath = groupId.replace('.', '/') def groupPath = groupId.replace('.', '/')
def artifactPath = artifactId 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.jar)
from project.files(gradle.startParameter.projectProperties.src) from project.files(gradle.startParameter.projectProperties.src)
from project.files(gradle.startParameter.projectProperties.doc) from project.files(gradle.startParameter.projectProperties.doc)
gradle.properties
+6 -6
View File
@@ -23,14 +23,14 @@ testDataVersion=1067176:id
kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
#kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
#kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
kotlinVersion=1.2.0-rc-39 kotlinVersion=1.2-20171110.225330-21
kotlinScriptRuntimeVersion=1.2.0-rc-39 kotlinScriptRuntimeVersion=1.2-20171110.225348-21
kotlinStdLibVersion=1.2.0-rc-39 kotlinStdLibVersion=1.2-20171110.225351-21
kotlinReflectVersion=1.2.0-rc-39 kotlinReflectVersion=1.2-20171110.225343-21
konanVersion=0.4 konanVersion=0.4
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
## ##
# required for performance mesuarement tasks # required for performance mesuarement tasks
kotlinStdLibJdk8Version=1.2.0-rc-39 kotlinStdLibJdk8Version=1.2-20171110.225357-21
kotlinGradlePluginVersion=1.2.0-rc-39 kotlinGradlePluginVersion=1.2-20171110.225340-21