Skip to content

Commit 99bca23

Browse files
committed
Switch to Kotlin 1.7.10
1 parent 852c835 commit 99bca23

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
plugins {
3-
kotlin("jvm") version "1.6.0"
3+
kotlin("jvm") version "1.7.10"
44
}
55

6-
val kotlinVersion: String by extra("1.6.0")
7-
val kotlinCoroutinesVersion: String by extra("1.6.0-RC")
6+
val kotlinVersion: String by extra("1.7.10")
7+
val kotlinCoroutinesVersion: String by extra("1.6.4")
88

99
allprojects {
1010
repositories {

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
1111
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
1212
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
13+
implementation("org.jetbrains.kotlin:kotlin-main-kts:$kotlinVersion")
1314
testImplementation("junit:junit:4.12")
1415
}
1516

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.script.examples.jvm.jsr223.mainKts
77

88
import javax.script.ScriptEngineManager
99

10+
@Suppress("UNUSED_PARAMETER")
1011
fun main(vararg args: String) {
1112
val engine = ScriptEngineManager().getEngineByExtension("main.kts")!!
1213

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.script.examples.jvm.jsr223.simple
77

88
import javax.script.ScriptEngineManager
99

10+
@Suppress("UNUSED_PARAMETER")
1011
fun main(vararg args: String) {
1112
val engine = ScriptEngineManager().getEngineByExtension("kts")!!
1213

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env kotlin
22

3-
@file:Repository("https://dl.bintray.com/jakubriegel/kotlin-shell")
43
@file:DependsOn("eu.jrie.jetbrains:kotlin-shell-core:0.2.1")
54
@file:DependsOn("org.slf4j:slf4j-simple:1.7.28")
65
@file:CompilerOptions("-Xopt-in=kotlin.RequiresOptIn")

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env kotlin
22

3-
@file:Repository("https://jcenter.bintray.com")
4-
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.11")
3+
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0")
54

65
import kotlinx.html.*; import kotlinx.html.stream.*; import kotlinx.html.attributes.*
76

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class SimpleMainKtsTest {
8888
fun testCompilerOptions() {
8989

9090
val out = captureOut {
91-
val res = evalFile(File("$TEST_DATA_ROOT/compile-java6.smain.kts"))
91+
val res = evalFile(File("$TEST_DATA_ROOT/compiler-options.smain.kts"))
9292
assertSucceeded(res)
9393
assertIsJava6Bytecode(res)
9494
}.lines()
@@ -144,7 +144,7 @@ class SimpleMainKtsTest {
144144
if (0xCAFEBABE.toInt() != header) throw IOException("Invalid header class header: $header")
145145
stream.readUnsignedShort() // minor
146146
val major = stream.readUnsignedShort()
147-
Assert.assertTrue(major == 50)
147+
Assert.assertEquals(52, major)
148148
}
149149
}
150150

jvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts jvm/simple-main-kts/simple-main-kts-test/testData/compiler-options.smain.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@file:CompilerOptions("-jvm-target", "1.6")
1+
@file:CompilerOptions("-jvm-target", "1.8", "-Xabi-stability=unstable")
22

33
interface Test {
44
fun print()

0 commit comments

Comments
 (0)