Upgrade toolchain to api/lv 1.4

buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts

@@ -37,8 +37,8 @@ configurations {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.languageVersion = "1.3"
-    kotlinOptions.apiVersion = "1.3"
+    kotlinOptions.languageVersion = "1.4"
+    kotlinOptions.apiVersion = "1.4"
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xskip-prerelease-check",
         "-Xskip-runtime-version-check",

compiler/cli/build.gradle.kts

@@ -57,8 +57,8 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
+        languageVersion = "1.4"
+        apiVersion = "1.4"
         freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf(
             "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments", "-Xnew-inference"
         )

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt

@@ -233,8 +233,8 @@ object JvmRuntimeVersionsConsistencyChecker {
         jars: List<KotlinLibraryFile>
     ): MavenComparableVersion? {
         assert(jars.isNotEmpty()) { "'jars' must not be empty" }
-        val oldestVersion = jars.minBy { it.version }!!.version
-        val newestVersion = jars.maxBy { it.version }!!.version
+        val oldestVersion = jars.minOf { it.version }
+        val newestVersion = jars.maxOf { it.version }
 
         // If the oldest version is the same as the newest version, then all jars have the same version
         if (oldestVersion == newestVersion) return oldestVersion
@@ -250,9 +250,9 @@ object JvmRuntimeVersionsConsistencyChecker {
         // we suggest to provide an explicit dependency on version X.
         // TODO: report this depending on the content of the jars instead
         val minReflectJar =
-            jars.filter { it.file.name.startsWith("kotlin-reflect") }.minBy { it.version }
+            jars.filter { it.file.name.startsWith("kotlin-reflect") }.minByOrNull { it.version }
         val maxStdlibJar =
-            jars.filter { it.file.name.startsWith("kotlin-runtime") || it.file.name.startsWith("kotlin-stdlib") }.maxBy { it.version }
+            jars.filter { it.file.name.startsWith("kotlin-runtime") || it.file.name.startsWith("kotlin-stdlib") }.maxByOrNull { it.version }
         if (minReflectJar != null && maxStdlibJar != null && minReflectJar.version < maxStdlibJar.version) {
             messageCollector.issue(
                 null,

compiler/daemon/daemon-client-new/build.gradle.kts

@@ -49,7 +49,7 @@ dependencies {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        apiVersion = "1.3"
+        apiVersion = "1.4"
         freeCompilerArgs += "-Xsuppress-version-warnings"
     }
 }

compiler/daemon/daemon-client/build.gradle.kts

@@ -40,8 +40,8 @@ dependencies {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        // This module is being run from within Gradle, older versions of which only have kotlin-stdlib 1.3 in the runtime classpath.
-        apiVersion = "1.3"
+        // This module is being run from within Gradle, older versions of which only have older kotlin-stdlib in the runtime classpath.
+        apiVersion = "1.4"
         freeCompilerArgs += "-Xsuppress-version-warnings"
     }
 }

compiler/util-io/build.gradle.kts

@@ -17,8 +17,8 @@ sourceSets {
 tasks {
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions {
-            languageVersion = "1.3"
-            apiVersion = "1.3"
+            languageVersion = "1.4"
+            apiVersion = "1.4"
             freeCompilerArgs += "-Xsuppress-version-warnings"
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt

@@ -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")
             }
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/build.gradle

@@ -9,7 +9,7 @@ repositories {
 
 compileKotlin {
     kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
+        languageVersion = "1.5"
+        apiVersion = "1.5"
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/src/main/kotlin/helloWorld.kt

@@ -1,7 +1 @@
-fun breakInWhen() {
-    while (true) {
-        when {
-            true -> break
-        }
-    }
-}
+fun <T> f(t: T): T!! = t!!

libraries/tools/kotlin-lombok/build.gradle.kts

@@ -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"
         )

libraries/tools/kotlin-project-model/build.gradle.kts

@@ -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")
 }
 

native/utils/build.gradle.kts

@@ -22,8 +22,8 @@ sourceSets {
 tasks {
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions {
-            languageVersion = "1.3"
-            apiVersion = "1.3"
+            languageVersion = "1.4"
+            apiVersion = "1.4"
             freeCompilerArgs += "-Xsuppress-version-warnings"
         }
     }