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

[kotlin compiler][update] 1.2.40-dev-610

Browse Source
This commit is contained in:
Vasily Levchenko
2018-02-12 12:04:15 +03:00
committed by Vasily Levchenko
parent 195d441d02
commit f78bd00e80
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dependencies/build.gradle
Vendored
+2
View File
@@ -58,6 +58,8 @@ modules.moduleEntry('annotation_processing_gradle', kotlinAnnotationProcessingGr
modules.moduleEntry('android_extensions', kotlinAndroidExtensionsVersion) modules.moduleEntry('android_extensions', kotlinAndroidExtensionsVersion)
modules.moduleEntry('compiler_runner', kotlinCompilerRunnerVersion) modules.moduleEntry('compiler_runner', kotlinCompilerRunnerVersion)
modules.moduleEntry('stdlib_jre7', kotlinStdLibJdk7Version) modules.moduleEntry('stdlib_jre7', kotlinStdLibJdk7Version)
modules.moduleEntry('build_common', kotlinBuildCommonVersion)
modules.moduleEntry('daemon_client', kotlinDaemonClientVersion)
private static String configurationJar(x) { private static String configurationJar(x) {
"kotlin_${x}_jar".toString() "kotlin_${x}_jar".toString()
dependencies/upload.gradle
Vendored
+2 -2
View File
@@ -29,7 +29,7 @@ task generatePom(type: DefaultTask) {
inputs.file(originalPom) inputs.file(originalPom)
def (_, artifactIdString, versionString) = gradle.startParameter.projectProperties.module.tokenize(':') def (_, artifactIdString, versionString) = gradle.startParameter.projectProperties.module.tokenize(':')
def versionPath = "${versionString.tokenize('-')[0]}-SNAPSHOT" def versionPath = versionString
def newPom = file("${temporaryDir.canonicalPath}/$artifactIdString-${versionString}.pom") def newPom = file("${temporaryDir.canonicalPath}/$artifactIdString-${versionString}.pom")
outputs.file(newPom) outputs.file(newPom)
@@ -69,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.tokenize('-')[0]}-SNAPSHOT" def versionPath = version
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
+14 -13
View File
@@ -23,23 +23,24 @@ testDataVersion=1226829: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
kotlinCompilerVersion=1.2-20180212.074217-235 kotlinCompilerVersion=1.2.40-dev-610
kotlinScriptRuntimeVersion=1.2-20180212.074236-235 kotlinScriptRuntimeVersion=1.2.40-dev-610
kotlinStdLibVersion=1.2-20180212.074248-235 kotlinStdLibVersion=1.2.40-dev-610
kotlinReflectVersion=1.2-20180212.074230-235 kotlinReflectVersion=1.2.40-dev-610
konanVersion=0.6 konanVersion=0.6
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
## ##
# required for performance mesuarement tasks # required for performance mesuarement tasks
kotlinStdLibJdk7Version=1.2-20180211.161219-234 kotlinStdLibJdk7Version=1.2.40-dev-610
kotlinStdLibJdk8Version=1.2-20180209.103010-228 kotlinStdLibJdk8Version=1.2.40-dev-610
kotlinGradlePluginVersion=1.2-20180209.102945-228 kotlinGradlePluginVersion=1.2.40-dev-610
kotlinGradlePluginApiVersion=1.2-20180208.144029-227
kotlinCompilerEmbeddableVersion=1.2-20180208.144022-227
kotlinAnnotationProcessingGradleVersion=1.2-20180208.144011-227
kotlinAndroidExtensionsVersion=1.2-20180208.144005-227
kotlinCompilerRunnerVersion=1.2-20180207.165101-224
kotlinGradlePluginApiVersion=1.2.40-dev-610
kotlinCompilerEmbeddableVersion=1.2.40-dev-610
kotlinAnnotationProcessingGradleVersion=1.2.40-dev-610
kotlinAndroidExtensionsVersion=1.2.40-dev-610
kotlinCompilerRunnerVersion=1.2.40-dev-610
kotlinBuildCommonVersion=1.2.40-dev-610
kotlinDaemonClientVersion=1.2.40-dev-610