diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 5851fdb9705..df39112d196 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -51,6 +51,7 @@ compileCompilerKotlin { // The protobuf plugin specifies this dependency for java by itself, // but not for Kotlin. dependsOn('generateCompilerProto') + kotlinOptions.jvmTarget = "1.8" } compileCompilerJava { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt index b0a6c157691..07187763752 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt @@ -109,7 +109,7 @@ internal class KonanLower(val context: Context, val parentPhaser: PhaseManager) } phaser.phase(KonanPhase.LOWER_DEFAULT_PARAMETER_EXTENT) { DefaultArgumentStubGenerator(context, skipInlineMethods = false).runOnFilePostfix(irFile) - KonanDefaultParameterInjector(context).runOnFilePostfix(irFile) + KonanDefaultParameterInjector(context).lower(irFile) } phaser.phase(KonanPhase.LOWER_BUILTIN_OPERATORS) { BuiltinOperatorLowering(context).lower(irFile) diff --git a/gradle.properties b/gradle.properties index 4b1ce11a2af..048af6c6667 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,12 +15,12 @@ # # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script. -buildKotlinVersion=1.3.20 -buildKotlinCompilerRepo=https://cache-redirector.jetbrains.com/maven-central +buildKotlinVersion=1.3.30-dev-1297 +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 -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 -kotlinVersion=1.3.30-dev-1296 -testKotlinVersion=1.3.30-dev-1296 +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-1419 +testKotlinVersion=1.3.30-dev-1419 konanVersion=1.2.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4