Skip to content

Commit b431f8c

Browse files
committed
build: update kotlin and adjust language and toolchain versions
1 parent e8b9513 commit b431f8c

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

build.gradle.kts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
14
plugins {
2-
kotlin("jvm") version "2.0.0"
3-
id("org.jetbrains.kotlinx.atomicfu") version "0.25.0"
5+
kotlin("jvm") version "2.0.10"
46
}
57

68
group = "dev.silenium.playground"
@@ -15,12 +17,9 @@ dependencies {
1517
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines")
1618
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-debug:$coroutines")
1719
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutines")
18-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:$coroutines")
1920
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines")
2021

21-
implementation("org.jetbrains.kotlinx:atomicfu:0.25.0")
22-
23-
val kotest = "5.9.0"
22+
val kotest = "5.9.1"
2423
testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotest")
2524
testImplementation("io.kotest:kotest-assertions-core-jvm:$kotest")
2625
testImplementation("io.kotest:kotest-property-jvm:$kotest")
@@ -30,6 +29,20 @@ tasks.test {
3029
useJUnitPlatform()
3130
}
3231

32+
tasks.compileKotlin {
33+
compilerOptions {
34+
jvmTarget = JvmTarget.JVM_1_8
35+
languageVersion = KotlinVersion.KOTLIN_1_7
36+
}
37+
}
38+
39+
tasks.compileTestKotlin {
40+
compilerOptions {
41+
jvmTarget = JvmTarget.JVM_1_8
42+
languageVersion = KotlinVersion.DEFAULT
43+
}
44+
}
45+
3346
kotlin {
34-
jvmToolchain(11)
47+
jvmToolchain(8)
3548
}

src/main/kotlin/dev/silenium/libs/flows/impl/FlowGraphImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ internal class FlowGraphImpl(private val coroutineScope: CoroutineScope) :
9191
elements.forEach(AutoCloseable::close)
9292
}
9393

94-
data object CoroutineContextKey : CoroutineContext.Key<CoroutineContextElement>
94+
object CoroutineContextKey : CoroutineContext.Key<CoroutineContextElement>
9595
data class CoroutineContextElement(
9696
val flowGraph: FlowGraph,
9797
override val key: CoroutineContext.Key<*> = CoroutineContextKey

0 commit comments

Comments
 (0)