Skip to content

Commit 2daa8c9

Browse files
authored
Merge pull request #689 from skydoves/cmp/1.8.0
Bump Compose Multiplatform to 1.8.0
2 parents 9e33ebc + e1b0a70 commit 2daa8c9

File tree

8 files changed

+8
-6
lines changed

8 files changed

+8
-6
lines changed

build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatform.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ internal fun Project.configureComposeMultiplatform(
3737
kotlinMultiplatformExtension.apply {
3838
androidTarget { publishLibraryVariants("release") }
3939
jvm("desktop")
40+
jvmToolchain(11)
4041

4142
wasmJs {
4243
browser {

build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ internal fun Project.configureComposeMultiplatformWasm(
3434
kotlinMultiplatformExtension.apply {
3535
androidTarget { publishLibraryVariants("release") }
3636
jvm("desktop")
37+
jvmToolchain(11)
3738

3839
wasmJs {
3940
browser {

coil3/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ baselineProfile {
119119

120120
tasks.withType<KotlinJvmCompile>().configureEach {
121121
compilerOptions {
122-
jvmTarget.set(JvmTarget.JVM_1_8)
122+
jvmTarget.set(JvmTarget.JVM_11)
123123
freeCompilerArgs.addAll(
124124
"-opt-in=coil3.annotation.ExperimentalCoilApi",
125125
)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ androidxMacroBenchmark = "1.4.0-beta01"
1818
androidxProfileinstaller = "1.4.1"
1919
androidxUiAutomator = "2.3.0"
2020
kotlinxSerializationJson = "1.8.1"
21-
jetbrains-compose = "1.7.3"
21+
jetbrains-compose = "1.8.0"
2222
glide = "4.16.0"
2323
fresco = "3.6.0"
2424
coil = "2.7.0"

landscapist-animation/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ baselineProfile {
9090

9191
tasks.withType<KotlinJvmCompile>().configureEach {
9292
compilerOptions {
93-
jvmTarget.set(JvmTarget.JVM_1_8)
93+
jvmTarget.set(JvmTarget.JVM_11)
9494
freeCompilerArgs.addAll(
9595
"-Xexplicit-api=strict",
9696
"-opt-in=kotlin.RequiresOptIn",

landscapist-palette/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ baselineProfile {
8585

8686
tasks.withType<KotlinJvmCompile>().configureEach {
8787
compilerOptions {
88-
jvmTarget.set(JvmTarget.JVM_1_8)
88+
jvmTarget.set(JvmTarget.JVM_11)
8989
freeCompilerArgs.addAll(
9090
"-Xexplicit-api=strict",
9191
"-opt-in=kotlin.RequiresOptIn",

landscapist-placeholder/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ baselineProfile {
9090

9191
tasks.withType<KotlinJvmCompile>().configureEach {
9292
compilerOptions {
93-
jvmTarget.set(JvmTarget.JVM_1_8)
93+
jvmTarget.set(JvmTarget.JVM_11)
9494
freeCompilerArgs.addAll(
9595
"-Xexplicit-api=strict",
9696
"-opt-in=kotlin.RequiresOptIn",

landscapist/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ baselineProfile {
8787

8888
tasks.withType<KotlinJvmCompile>().configureEach {
8989
compilerOptions {
90-
jvmTarget.set(JvmTarget.JVM_1_8)
90+
jvmTarget.set(JvmTarget.JVM_11)
9191

9292
}
9393
}

0 commit comments

Comments
 (0)