Switch to Kotlin 1.7.10

Author: ligee

build.gradle.kts

@@ -1,10 +1,10 @@
 
 plugins {
-    kotlin("jvm") version "1.6.0"
+    kotlin("jvm") version "1.7.10"
 }
 
-val kotlinVersion: String by extra("1.6.0")
-val kotlinCoroutinesVersion: String by extra("1.6.0-RC")
+val kotlinVersion: String by extra("1.7.10")
+val kotlinCoroutinesVersion: String by extra("1.6.4")
 
 allprojects {
     repositories {

jvm/basic/jvm-simple-script/host/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
+    implementation("org.jetbrains.kotlin:kotlin-main-kts:$kotlinVersion")
     testImplementation("junit:junit:4.12")
 }
 

jvm/jsr223/jsr223-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/jvm/jsr223/mainKts/repl.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.script.examples.jvm.jsr223.mainKts
 
 import javax.script.ScriptEngineManager
 
+@Suppress("UNUSED_PARAMETER")
 fun main(vararg args: String) {
     val engine = ScriptEngineManager().getEngineByExtension("main.kts")!!
 

jvm/jsr223/jsr223-simple/src/main/kotlin/org/jetbrains/kotlin/script/examples/jvm/jsr223/simple/repl.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.script.examples.jvm.jsr223.simple
 
 import javax.script.ScriptEngineManager
 
+@Suppress("UNUSED_PARAMETER")
 fun main(vararg args: String) {
     val engine = ScriptEngineManager().getEngineByExtension("kts")!!
 

jvm/main-kts/scripts/kotlin-shell.main.kts

@@ -1,6 +1,5 @@
 #!/usr/bin/env kotlin
 
-@file:Repository("https://dl.bintray.com/jakubriegel/kotlin-shell")
 @file:DependsOn("eu.jrie.jetbrains:kotlin-shell-core:0.2.1")
 @file:DependsOn("org.slf4j:slf4j-simple:1.7.28")
 @file:CompilerOptions("-Xopt-in=kotlin.RequiresOptIn")

jvm/main-kts/scripts/kotlinx-html.main.kts

@@ -1,7 +1,6 @@
 #!/usr/bin/env kotlin
 
-@file:Repository("https://jcenter.bintray.com")
-@file:DependsOn("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.11")
+@file:DependsOn("org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0")
 
 import kotlinx.html.*; import kotlinx.html.stream.*; import kotlinx.html.attributes.*
 

jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt

@@ -88,7 +88,7 @@ class SimpleMainKtsTest {
     fun testCompilerOptions() {
 
         val out = captureOut {
-            val res = evalFile(File("$TEST_DATA_ROOT/compile-java6.smain.kts"))
+            val res = evalFile(File("$TEST_DATA_ROOT/compiler-options.smain.kts"))
             assertSucceeded(res)
             assertIsJava6Bytecode(res)
         }.lines()
@@ -144,7 +144,7 @@ class SimpleMainKtsTest {
             if (0xCAFEBABE.toInt() != header) throw IOException("Invalid header class header: $header")
             stream.readUnsignedShort() // minor
             val major = stream.readUnsignedShort()
-            Assert.assertTrue(major == 50)
+            Assert.assertEquals(52, major)
         }
     }
 

…ts-test/testData/compile-java6.smain.kts …test/testData/compiler-options.smain.ktsjvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts renamed to jvm/simple-main-kts/simple-main-kts-test/testData/compiler-options.smain.kts jvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts renamed to jvm/simple-main-kts/simple-main-kts-test/testData/compiler-options.smain.kts

@@ -1,4 +1,4 @@
-@file:CompilerOptions("-jvm-target", "1.6")
+@file:CompilerOptions("-jvm-target", "1.8", "-Xabi-stability=unstable")
 
 interface Test {
     fun print()