Updated kotlin version to 2.1.0-RC

common/src/main/kotlin/component/KotlinEnvironment.kt

@@ -52,7 +52,7 @@ class KotlinEnvironment(
       "-opt-in=kotlin.io.encoding.ExperimentalEncodingApi",
       "-Xcontext-receivers",
       "-Xreport-all-warnings",
-      "-Xuse-fir-extended-checkers",
+      "-Wextra",
       "-XXLanguage:+ExplicitBackingFields",
     )
   }
@@ -127,7 +127,6 @@ class KotlinEnvironment(
       val messageCollector = MessageCollector.NONE
       put(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
       put(CommonConfigurationKeys.MODULE_NAME, "web-module")
-      put(JSConfigurationKeys.TYPED_ARRAYS_ENABLED, true)
       put(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION, true)
 
       languageVersionSettings = arguments.toLanguageVersionSettings(messageCollector)

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.0-Beta1"
+kotlin = "2.1.0-RC"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "2.7.10"

src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt

@@ -75,7 +75,6 @@ fun <T> CLICompiler<*>.tryCompilation(inputDirectory: Path, inputFiles: List<Pat
         STRONG_WARNING, WARNING -> ProjectSeveriry.WARNING
         INFO, LOGGING, OUTPUT -> return ""
       }
-
       val textInterval = location?.let {
         TextInterval(
           start = TextInterval.TextPosition(minusOne(location.line), minusOne(location.column)),

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

@@ -96,8 +96,7 @@ class KotlinToJSTranslator(
         val klibPath = (outputDir / "klib").toFile().canonicalPath
         val additionalCompilerArgumentsForKLib = listOf(
           "-Xreport-all-warnings",
-          "-Xuse-fir-extended-checkers",
-          "-Xir-only",
+          "-Wextra",
           "-Xir-produce-klib-dir",
           "-libraries=${kotlinEnvironment.JS_LIBRARIES.joinToString(PATH_SEPARATOR)}",
           "-ir-output-dir=$klibPath",
@@ -107,8 +106,7 @@ class KotlinToJSTranslator(
           .flatMap {
             k2JSCompiler.tryCompilation(inputDir, ioFiles, listOf(
               "-Xreport-all-warnings",
-              "-Xuse-fir-extended-checkers",
-              "-Xir-only",
+              "-Wextra",
               "-Xir-produce-js",
               "-Xir-dce",
               "-Xinclude=$klibPath",
@@ -159,7 +157,7 @@ class KotlinToJSTranslator(
               } ?: emptyList()
           val additionalCompilerArgumentsForKLib: List<String> = listOf(
             "-Xreport-all-warnings",
-          "-Xuse-fir-extended-checkers",
+            "-Wextra",
           "-Xwasm",
           "-Xir-produce-klib-dir",
           "-libraries=${dependencies.joinToString(PATH_SEPARATOR)}",
@@ -171,7 +169,7 @@ class KotlinToJSTranslator(
           .flatMap {
             k2JSCompiler.tryCompilation(inputDir, ioFiles, mutableListOf(
               "-Xreport-all-warnings",
-              "-Xuse-fir-extended-checkers",
+              "-Wextra",
               "-Xwasm",
               "-Xir-produce-js",
               "-Xir-dce",

src/test/kotlin/com/compiler/server/KoansJUnitTestsRunnerTest.kt

@@ -24,7 +24,7 @@ class KoansJUnitTestsRunnerTest : BaseJUnitTest() {
   @Test
   fun `koans test Default arguments`() {
     runKoanTest(
-      "fun foo(name: String, number: Int = 42, toUpperCase: Boolean = false) =\n        (if (toUpperCase) name.toUpperCase() else name) + number\n\nfun useFoo() = listOf(\n        foo(\"a\"),\n        foo(\"b\", number = 1),\n        foo(\"c\", toUpperCase = true),\n        foo(name = \"d\", number = 2, toUpperCase = true)\n)",
+      "fun foo(name: String, number: Int = 42, toUpperCase: Boolean = false) =\n        (if (toUpperCase) name.uppercase() else name) + number\n\nfun useFoo() = listOf(\n        foo(\"a\"),\n        foo(\"b\", number = 1),\n        foo(\"c\", toUpperCase = true),\n        foo(name = \"d\", number = 2, toUpperCase = true)\n)",
       "import org.junit.Test\nimport org.junit.Assert\n\nclass TestDefaultAndNamedParams() {\n\n    @Test fun testDefaultAndNamedParams() {\n        Assert.assertEquals(listOf(\"a42\", \"b1\", \"C42\", \"D2\"), useFoo())\n    }\n}"
     )
   }

src/test/resources/test-compile-output/jvm/kotlin-by-example/02_Set/8ec43b0c11c651c669571c359f1e9556.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":11,"ch":19},"end":{"line":11,"ch":25}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":12,"ch":26},"end":{"line":12,"ch":32}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>Issue uniqueDescr4 registered correctly.\nIssue uniqueDescr2 marked as duplicate and rejected.\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>Issue uniqueDescr4 registered correctly.\nIssue uniqueDescr2 marked as duplicate and rejected.\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-by-example/03_Variables/ff9d772244aab97db76d055793905ec6.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":4},"end":{"line":2,"ch":7}},"message":"The 'var' property is never written to, so it can be declared as 'val'.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":2,"ch":11},"end":{"line":2,"ch":17}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":4,"ch":8},"end":{"line":4,"ch":9}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":4,"ch":11},"end":{"line":4,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":5,"ch":8},"end":{"line":5,"ch":9}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>initial\n</outStream>"}
+{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":4},"end":{"line":2,"ch":7}},"message":"The 'var' property is never written to, so it can be declared as 'val'.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":4,"ch":8},"end":{"line":4,"ch":9}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":5,"ch":8},"end":{"line":5,"ch":9}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>initial\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-syntax/5ec261721162729866abc1e8f7293ef4.10.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":3,"ch":11},"end":{"line":3,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>6\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>6\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-syntax/5ec261721162729866abc1e8f7293ef4.9.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":3,"ch":11},"end":{"line":3,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>5\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>5\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-types/be5678589cf16c80d1cda9c85d9a55d9.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":11},"end":{"line":2,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":6,"ch":11},"end":{"line":6,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":10,"ch":12},"end":{"line":10,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":11,"ch":12},"end":{"line":11,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\n</outStream>"}
+{"errors":{"File.kt":[{"interval":{"start":{"line":10,"ch":12},"end":{"line":10,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":11,"ch":12},"end":{"line":11,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-types/be5678589cf16c80d1cda9c85d9a55d9.2.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":11},"end":{"line":2,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\ntrue\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\ntrue\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-types/be5678589cf16c80d1cda9c85d9a55d9.8.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":16},"end":{"line":2,"ch":23}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":3,"ch":17},"end":{"line":3,"ch":24}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":4,"ch":8},"end":{"line":4,"ch":16}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\nfalse\n</outStream>"}
+{"errors":{"File.kt":[{"interval":{"start":{"line":4,"ch":8},"end":{"line":4,"ch":16}},"message":"Variable is unused.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\nfalse\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/basic-types/be5678589cf16c80d1cda9c85d9a55d9.9.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":15},"end":{"line":2,"ch":19}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>a\n\n\n＀\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>a\n\n\n＀\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/booleans/12bb120f56ea8aee70a72c46b1a1383f.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":16},"end":{"line":2,"ch":23}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":3,"ch":17},"end":{"line":3,"ch":24}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\nfalse\nnull\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\nfalse\nnull\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/characters/8de4516ae10b8b417425b7e50699400b.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":15},"end":{"line":2,"ch":19}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>a\n\n\n＀\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>a\n\n\n＀\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/kotlin-tour-basic-types/8d9f1ad7f4763df1c70051cd4e48a924.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":20},"end":{"line":2,"ch":22}},"message":"Initializer is redundant.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":7,"ch":14},"end":{"line":7,"ch":15}},"message":"Assignment can be replaced with operator assignment.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>10\n</outStream>"}
+{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":20},"end":{"line":2,"ch":22}},"message":"Initializer is redundant.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>10\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/kotlin-tour-basic-types/8d9f1ad7f4763df1c70051cd4e48a924.2.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":8,"ch":11},"end":{"line":8,"ch":17}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>3\nhello\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>3\nhello\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/numbers/f56d9449111795feee96b7f922b3320d.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":11},"end":{"line":2,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":6,"ch":11},"end":{"line":6,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":10,"ch":12},"end":{"line":10,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":11,"ch":12},"end":{"line":11,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\n</outStream>"}
+{"errors":{"File.kt":[{"interval":{"start":{"line":10,"ch":12},"end":{"line":10,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"},{"interval":{"start":{"line":11,"ch":12},"end":{"line":11,"ch":36}},"message":"Identity equality for arguments of types 'kotlin.Int?' and 'kotlin.Int?' is prohibited.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\nfalse\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/numbers/f56d9449111795feee96b7f922b3320d.2.json

@@ -1 +1 @@
-{"errors":{"File.kt":[{"interval":{"start":{"line":2,"ch":11},"end":{"line":2,"ch":14}},"message":"Redundant explicit type.","severity":"WARNING","className":"WARNING"}]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\ntrue\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>true\ntrue\n</outStream>"}