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

[kotlin compiler][update] 1.3.30-dev-1419

Browse Source
This commit is contained in:
Vasily Levchenko
2019-02-04 17:42:28 +03:00
parent 4cc6c18e13
commit f6a6a0dea3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+1
View File
@@ -51,6 +51,7 @@ compileCompilerKotlin {
// The protobuf plugin specifies this dependency for java by itself, // The protobuf plugin specifies this dependency for java by itself,
// but not for Kotlin. // but not for Kotlin.
dependsOn('generateCompilerProto') dependsOn('generateCompilerProto')
kotlinOptions.jvmTarget = "1.8"
} }
compileCompilerJava { compileCompilerJava {
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt
+1 -1
View File
@@ -109,7 +109,7 @@ internal class KonanLower(val context: Context, val parentPhaser: PhaseManager)
} }
phaser.phase(KonanPhase.LOWER_DEFAULT_PARAMETER_EXTENT) { phaser.phase(KonanPhase.LOWER_DEFAULT_PARAMETER_EXTENT) {
DefaultArgumentStubGenerator(context, skipInlineMethods = false).runOnFilePostfix(irFile) DefaultArgumentStubGenerator(context, skipInlineMethods = false).runOnFilePostfix(irFile)
KonanDefaultParameterInjector(context).runOnFilePostfix(irFile) KonanDefaultParameterInjector(context).lower(irFile)
} }
phaser.phase(KonanPhase.LOWER_BUILTIN_OPERATORS) { phaser.phase(KonanPhase.LOWER_BUILTIN_OPERATORS) {
BuiltinOperatorLowering(context).lower(irFile) BuiltinOperatorLowering(context).lower(irFile)
gradle.properties
+5 -5
View File
@@ -15,12 +15,12 @@
# #
# A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script. # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
buildKotlinVersion=1.3.20 buildKotlinVersion=1.3.30-dev-1297
buildKotlinCompilerRepo=https://cache-redirector.jetbrains.com/maven-central buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1297,pinned:true/artifacts/content/maven
remoteRoot=konan_tests remoteRoot=konan_tests
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1296,pinned:true/artifacts/content/maven kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1419,branch:default:true,pinned:true/artifacts/content/maven
kotlinVersion=1.3.30-dev-1296 kotlinVersion=1.3.30-dev-1419
testKotlinVersion=1.3.30-dev-1296 testKotlinVersion=1.3.30-dev-1419
konanVersion=1.2.0 konanVersion=1.2.0
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.workers.max=4 org.gradle.workers.max=4