Upgrade toolchain to api/lv 1.4

This commit is contained in:
Mikhael Bogdanov
2021-06-30 19:37:56 +02:00
parent a919aab3ab
commit 228100ef09
12 changed files with 23 additions and 29 deletions
@@ -67,7 +67,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
fun testLanguageVersion(gradleVersion: GradleVersion) {
project("languageVersion", gradleVersion) {
buildAndFail("build") {
assertOutputContains("'break' and 'continue' are not allowed in 'when' statements")
assertOutputContains("The feature \"definitely not null type parameters\" is only available since language version 1.6")
}
}
}
@@ -9,7 +9,7 @@ repositories {
compileKotlin {
kotlinOptions {
languageVersion = "1.3"
apiVersion = "1.3"
languageVersion = "1.5"
apiVersion = "1.5"
}
}
@@ -1,7 +1 @@
fun breakInWhen() {
while (true) {
when {
true -> break
}
}
}
fun <T> f(t: T): T!! = t!!
@@ -27,8 +27,8 @@ runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
tasks {
withType<KotlinCompile> {
// kotlinOptions.jdkHome = rootProject.extra["JDK_18"] as String
kotlinOptions.languageVersion = "1.3"
kotlinOptions.apiVersion = "1.3"
kotlinOptions.languageVersion = "1.4"
kotlinOptions.apiVersion = "1.4"
kotlinOptions.freeCompilerArgs += listOf(
"-Xskip-prerelease-check", "-Xsuppress-version-warnings"
)
@@ -18,8 +18,8 @@ pill {
}
kotlin.target.compilations.all {
kotlinOptions.languageVersion = "1.3"
kotlinOptions.apiVersion = "1.3"
kotlinOptions.languageVersion = "1.4"
kotlinOptions.apiVersion = "1.4"
kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check")
}