Skip to content

Commit 25d784d

Browse files
committed
chore: update dependencies, remove kotlin block from native subproject build script
1 parent 5ea4d02 commit 25d784d

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
22
import org.jetbrains.gradle.ext.ProjectSettings
33
import org.jetbrains.gradle.ext.TaskTriggersConfig
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
45

56
plugins {
67
alias(libs.plugins.kotlin)
@@ -96,6 +97,7 @@ tasks {
9697
kotlin {
9798
compilerOptions {
9899
freeCompilerArgs.add("-Xcontext-receivers")
100+
jvmTarget = JvmTarget.JVM_11
99101
}
100102
jvmToolchain(11)
101103
}

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kotlinx-coroutines = "1.10.1"
55
kotlinx-serialization = "1.8.0"
66
kotlinx-datetime = "0.6.1"
77

8-
compose = "1.7.0"
9-
compose-gl = "0.7.0"
10-
jni-utils = "0.1.5"
11-
skiko = "0.8.15-egl"
8+
compose = "1.7.3"
9+
compose-gl = "0.7.2"
10+
jni-utils = "0.1.6"
11+
skiko = "0.8.19-egl"
1212
jna = "5.16.0"
1313

1414
slf4j = "2.0.16"

native/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import dev.silenium.libs.jni.NativeLoader
22
import dev.silenium.libs.jni.NativePlatform
33
import dev.silenium.libs.jni.Platform
4-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
5-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
64

75
buildscript {
86
repositories {
@@ -94,14 +92,6 @@ tasks.processResources {
9492
}
9593
}
9694

97-
kotlin {
98-
jvmToolchain(8)
99-
compilerOptions {
100-
jvmTarget = JvmTarget.JVM_1_8
101-
languageVersion = KotlinVersion.KOTLIN_1_7
102-
}
103-
}
104-
10595
publishing {
10696
publications {
10797
if (deployNative) {

0 commit comments

Comments
 (0)