Skip to content

Commit f7f83a9

Browse files
authored
Merge pull request #39 from MohamedRejeb/0.3x
Update jvm targets
2 parents 794266f + e21b73c commit f7f83a9

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

compose-dnd/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ kotlin {
5252
}
5353
}
5454

55-
jvmToolchain(11)
56-
jvm("desktop")
55+
jvm("desktop") {
56+
compilerOptions {
57+
jvmTarget.set(JvmTarget.JVM_11)
58+
}
59+
}
5760

5861
js(IR) {
5962
browser()
@@ -95,8 +98,4 @@ android {
9598
sourceCompatibility = JavaVersion.VERSION_1_8
9699
targetCompatibility = JavaVersion.VERSION_1_8
97100
}
98-
99-
kotlin {
100-
jvmToolchain(8)
101-
}
102101
}

sample/common/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ kotlin {
5050
}
5151
}
5252

53-
jvmToolchain(11)
54-
jvm("desktop")
53+
jvm("desktop") {
54+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
55+
compilerOptions {
56+
jvmTarget.set(JvmTarget.JVM_11)
57+
}
58+
}
5559

5660
js(IR) {
5761
browser()
@@ -96,8 +100,4 @@ android {
96100
sourceCompatibility = JavaVersion.VERSION_1_8
97101
targetCompatibility = JavaVersion.VERSION_1_8
98102
}
99-
100-
kotlin {
101-
jvmToolchain(8)
102-
}
103103
}

sample/desktop/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlinMultiplatform)
@@ -7,8 +8,11 @@ plugins {
78
}
89

910
kotlin {
10-
jvmToolchain(11)
11-
jvm("desktop")
11+
jvm("desktop") {
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_11)
14+
}
15+
}
1216

1317
sourceSets["desktopMain"].dependencies {
1418
implementation(projects.sample.common)

0 commit comments

Comments
 (0)