Merge pull request #930 from supabase-community/dependabot/gradle/compose-1.8.0

jan-tennert · web-flow · commit c3e532213a43 · 2025-06-02T14:40:21.000+02:00
Bump compose from 1.7.3 to 1.8.0
diff --git a/buildSrc/src/main/kotlin/Android.kt b/buildSrc/src/main/kotlin/Android.kt
@@ -28,7 +28,9 @@ fun Project.configureLibraryAndroidTarget(
     }
 }
 
-fun BaseAppModuleExtension.configureApplicationAndroidTarget() {
+fun BaseAppModuleExtension.configureApplicationAndroidTarget(
+    javaVersion: JavaVersion = JavaVersion.VERSION_1_8
+) {
     compileSdk = 35
     defaultConfig {
         applicationId = "io.github.jan.supabase.android"
@@ -38,8 +40,8 @@ fun BaseAppModuleExtension.configureApplicationAndroidTarget() {
     }
     namespace = "io.github.jan.supabase.android"
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
     buildTypes {
         getByName("release") {
diff --git a/buildSrc/src/main/kotlin/KotlinTargets.kt b/buildSrc/src/main/kotlin/KotlinTargets.kt
@@ -33,23 +33,23 @@ fun KotlinMultiplatformExtension.desktopTargets() {
     linuxX64()
 }
 
-fun KotlinMultiplatformExtension.configuredJvmTarget() {
+fun KotlinMultiplatformExtension.configuredJvmTarget(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {
     jvm {
-        compilerOptions.jvmTarget = JvmTarget.JVM_1_8
+        compilerOptions.jvmTarget = jvmTarget
     }
 }
 
-fun KotlinMultiplatformExtension.configuredAndroidTarget() {
+fun KotlinMultiplatformExtension.configuredAndroidTarget(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {
     androidTarget {
         publishLibraryVariants("release", "debug")
-        compilerOptions.jvmTarget = JvmTarget.JVM_1_8
+        compilerOptions.jvmTarget = jvmTarget
     }
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
-fun KotlinMultiplatformExtension.jvmTargets() {
-    configuredAndroidTarget()
-    configuredJvmTarget()
+fun KotlinMultiplatformExtension.jvmTargets(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {
+    configuredAndroidTarget(jvmTarget)
+    configuredJvmTarget(jvmTarget)
 }
 
 fun KotlinMultiplatformExtension.jsTarget() {
@@ -94,8 +94,10 @@ fun KotlinMultiplatformExtension.allTargets() {
     wasmJsTarget()
 }
 
-fun KotlinMultiplatformExtension.composeTargets() {
-    jvmTargets()
+fun KotlinMultiplatformExtension.composeTargets(
+    jvmTarget: JvmTarget = JvmTarget.JVM_1_8,
+) {
+    jvmTargets(jvmTarget)
     jsTarget()
     iosTargets()
     wasmJsTarget()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ moshi = "1.15.2"
 jackson = "2.19.0"
 browser = "1.8.0"
 googleid = "1.1.1"
-compose = "1.7.3"
+compose = "1.8.1"
 androidsvg = "1.4"
 imageloader = "1.9.0"
 coil2 = "2.7.0"
diff --git a/plugins/ComposeAuth/build.gradle.kts b/plugins/ComposeAuth/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
 import com.android.build.gradle.internal.lint.LintModelWriterTask
 import com.android.build.gradle.internal.tasks.LintModelMetadataTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
@@ -28,7 +29,8 @@ kotlin {
             }
         }
     }
-    composeTargets()
+    jvmToolchain(11)
+    composeTargets(JvmTarget.JVM_11)
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -48,7 +50,7 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()
+configureLibraryAndroidTarget(javaVersion = JavaVersion.VERSION_11)
 
 //see https://github.com/JetBrains/compose-multiplatform/issues/4739
 tasks.withType<LintModelWriterTask> {
diff --git a/plugins/ComposeAuthUI/build.gradle.kts b/plugins/ComposeAuthUI/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
 import com.android.build.gradle.internal.lint.LintModelWriterTask
 import com.android.build.gradle.internal.tasks.LintModelMetadataTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
@@ -27,7 +28,8 @@ kotlin {
             }
         }
     }
-    composeTargets()
+    composeTargets(JvmTarget.JVM_11)
+    jvmToolchain(11)
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -44,7 +46,7 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()
+configureLibraryAndroidTarget(javaVersion = JavaVersion.VERSION_11)
 
 //see https://github.com/JetBrains/compose-multiplatform/issues/4739
 tasks.withType<LintModelWriterTask> {
diff --git a/sample/chat-demo-mpp/android/build.gradle.kts b/sample/chat-demo-mpp/android/build.gradle.kts
@@ -15,8 +15,8 @@ dependencies {
 }
 
 android {
-    configureApplicationAndroidTarget()
+    configureApplicationAndroidTarget(JavaVersion.VERSION_11)
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
diff --git a/sample/chat-demo-mpp/common/build.gradle.kts b/sample/chat-demo-mpp/common/build.gradle.kts
@@ -1,6 +1,7 @@
 @file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 plugins {
@@ -25,8 +26,12 @@ kotlin {
         }
     }
     androidTarget()
-    jvmToolchain(8)
-    jvm("desktop")
+    jvmToolchain(11)
+    jvm("desktop") {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     js(IR) {
         browser()
     }
@@ -82,4 +87,4 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8)
+configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_11)
diff --git a/sample/chat-demo-mpp/desktop/build.gradle.kts b/sample/chat-demo-mpp/desktop/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
     id(libs.plugins.compose.plugin.get().pluginId)
@@ -10,8 +12,12 @@ version = "1.0-SNAPSHOT"
 
 
 kotlin {
-    jvmToolchain(8)
-    jvm()
+    jvmToolchain(11)
+    jvm {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/sample/file-upload/android/build.gradle.kts b/sample/file-upload/android/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
 }
 
 android {
-    configureApplicationAndroidTarget()
+    configureApplicationAndroidTarget(JavaVersion.VERSION_11)
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
diff --git a/sample/file-upload/common/build.gradle.kts b/sample/file-upload/common/build.gradle.kts
@@ -2,6 +2,7 @@
 
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 plugins {
@@ -16,9 +17,13 @@ group = "io.github.jan.supabase"
 version = "1.0-SNAPSHOT"
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(11)
     androidTarget()
-    jvm("desktop")
+    jvm("desktop") {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     applyDefaultHierarchyTemplate {
         common {
             group("nonJs") {
@@ -62,4 +67,4 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8)
+configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_11)
diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt
@@ -73,7 +73,7 @@ fun UploadScreen(viewModel: UploadViewModel) {
                 }
         ) {
             items(states, { it.fingerprint.source + it.fingerprint.size }) {
-                Box(Modifier.animateItemPlacement()) {
+                Box(Modifier.animateItem()) {
                     if(it is UploadState.Loaded) {
                         UploadCard(
                             it.state,
diff --git a/sample/file-upload/desktop/build.gradle.kts b/sample/file-upload/desktop/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
@@ -12,8 +13,12 @@ version = "1.0-SNAPSHOT"
 
 
 kotlin {
-    jvmToolchain(8)
-    jvm()
+    jvmToolchain(11)
+    jvm {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/sample/multi-factor-auth/android/build.gradle.kts b/sample/multi-factor-auth/android/build.gradle.kts
@@ -15,8 +15,8 @@ dependencies {
 }
 
 android {
-    configureApplicationAndroidTarget()
+    configureApplicationAndroidTarget(JavaVersion.VERSION_11)
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
diff --git a/sample/multi-factor-auth/common/build.gradle.kts b/sample/multi-factor-auth/common/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id(libs.plugins.android.library.get().pluginId)
@@ -14,9 +15,13 @@ version = "1.0-SNAPSHOT"
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(11)
     androidTarget()
-    jvm("desktop")
+    jvm("desktop") {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     js(IR) {
         browser()
     }
@@ -69,4 +74,4 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8)
+configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_11)
diff --git a/sample/multi-factor-auth/desktop/build.gradle.kts b/sample/multi-factor-auth/desktop/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id(libs.plugins.compose.plugin.get().pluginId)
     alias(libs.plugins.compose.compiler)
@@ -10,8 +12,12 @@ version = "1.0-SNAPSHOT"
 
 
 kotlin {
-    jvmToolchain(8)
-    jvm()
+    jvmToolchain(11)
+    jvm {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     sourceSets {
         val jvmMain by getting {
             dependencies {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ fun Project.configureLibraryAndroidTarget(`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-fun BaseAppModuleExtension.configureApplicationAndroidTarget() {`
	`31`	`+fun BaseAppModuleExtension.configureApplicationAndroidTarget(`
	`32`	`+ javaVersion: JavaVersion = JavaVersion.VERSION_1_8`
	`33`	`+) {`
`32`	`34`	`compileSdk = 35`
`33`	`35`	`defaultConfig {`
`34`	`36`	`applicationId = "io.github.jan.supabase.android"`
`@@ -38,8 +40,8 @@ fun BaseAppModuleExtension.configureApplicationAndroidTarget() {`
`38`	`40`	`}`
`39`	`41`	`namespace = "io.github.jan.supabase.android"`
`40`	`42`	`compileOptions {`
`41`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`42`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`43`	`+ sourceCompatibility = javaVersion`
	`44`	`+ targetCompatibility = javaVersion`
`43`	`45`	`}`
`44`	`46`	`buildTypes {`
`45`	`47`	`getByName("release") {`
Original file line number	Diff line number	Diff line change
`@@ -33,23 +33,23 @@ fun KotlinMultiplatformExtension.desktopTargets() {`
`33`	`33`	`linuxX64()`
`34`	`34`	`}`
`35`	`35`
`36`		`-fun KotlinMultiplatformExtension.configuredJvmTarget() {`
	`36`	`+fun KotlinMultiplatformExtension.configuredJvmTarget(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {`
`37`	`37`	`jvm {`
`38`		`- compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
	`38`	`+ compilerOptions.jvmTarget = jvmTarget`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-fun KotlinMultiplatformExtension.configuredAndroidTarget() {`
	`42`	`+fun KotlinMultiplatformExtension.configuredAndroidTarget(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {`
`43`	`43`	`androidTarget {`
`44`	`44`	`publishLibraryVariants("release", "debug")`
`45`		`- compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
	`45`	`+ compilerOptions.jvmTarget = jvmTarget`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@OptIn(ExperimentalKotlinGradlePluginApi::class)`
`50`		`-fun KotlinMultiplatformExtension.jvmTargets() {`
`51`		`- configuredAndroidTarget()`
`52`		`- configuredJvmTarget()`
	`50`	`+fun KotlinMultiplatformExtension.jvmTargets(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {`
	`51`	`+ configuredAndroidTarget(jvmTarget)`
	`52`	`+ configuredJvmTarget(jvmTarget)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`fun KotlinMultiplatformExtension.jsTarget() {`
`@@ -94,8 +94,10 @@ fun KotlinMultiplatformExtension.allTargets() {`
`94`	`94`	`wasmJsTarget()`
`95`	`95`	`}`
`96`	`96`
`97`		`-fun KotlinMultiplatformExtension.composeTargets() {`
`98`		`- jvmTargets()`
	`97`	`+fun KotlinMultiplatformExtension.composeTargets(`
	`98`	`+ jvmTarget: JvmTarget = JvmTarget.JVM_1_8,`
	`99`	`+) {`
	`100`	`+ jvmTargets(jvmTarget)`
`99`	`101`	`jsTarget()`
`100`	`102`	`iosTargets()`
`101`	`103`	`wasmJsTarget()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask`
`2`	`2`	`import com.android.build.gradle.internal.lint.LintModelWriterTask`
`3`	`3`	`import com.android.build.gradle.internal.tasks.LintModelMetadataTask`
	`4`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`4`	`5`
`5`	`6`	`plugins {`
`6`	`7`	`id(libs.plugins.kotlin.multiplatform.get().pluginId)`
`@@ -28,7 +29,8 @@ kotlin {`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`	`}`
`31`		`- composeTargets()`
	`32`	`+ jvmToolchain(11)`
	`33`	`+ composeTargets(JvmTarget.JVM_11)`
`32`	`34`	`sourceSets {`
`33`	`35`	`val commonMain by getting {`
`34`	`36`	`dependencies {`
`@@ -48,7 +50,7 @@ kotlin {`
`48`	`50`	`}`
`49`	`51`	`}`
`50`	`52`
`51`		`-configureLibraryAndroidTarget()`
	`53`	`+configureLibraryAndroidTarget(javaVersion = JavaVersion.VERSION_11)`
`52`	`54`
`53`	`55`	`//see https://github.com/JetBrains/compose-multiplatform/issues/4739`
`54`	`56`	`tasks.withType<LintModelWriterTask> {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ dependencies {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`android {`
`18`		`- configureApplicationAndroidTarget()`
	`18`	`+ configureApplicationAndroidTarget(JavaVersion.VERSION_11)`
`19`	`19`	`kotlinOptions {`
`20`		`- jvmTarget = "1.8"`
	`20`	`+ jvmTarget = "11"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)`
`2`	`2`
`3`	`3`	`import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi`
	`4`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`4`	`5`
`5`	`6`
`6`	`7`	`plugins {`
`@@ -25,8 +26,12 @@ kotlin {`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`androidTarget()`
`28`		`- jvmToolchain(8)`
`29`		`- jvm("desktop")`
	`29`	`+ jvmToolchain(11)`
	`30`	`+ jvm("desktop") {`
	`31`	`+ compilerOptions {`
	`32`	`+ jvmTarget = JvmTarget.JVM_11`
	`33`	`+ }`
	`34`	`+ }`
`30`	`35`	`js(IR) {`
`31`	`36`	`browser()`
`32`	`37`	`}`
`@@ -82,4 +87,4 @@ kotlin {`
`82`	`87`	`}`
`83`	`88`	`}`
`84`	`89`
`85`		`-configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8)`
	`90`	`+configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_11)`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ dependencies {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`android {`
`19`		`- configureApplicationAndroidTarget()`
	`19`	`+ configureApplicationAndroidTarget(JavaVersion.VERSION_11)`
`20`	`20`	`kotlinOptions {`
`21`		`- jvmTarget = "1.8"`
	`21`	`+ jvmTarget = "11"`
`22`	`22`	`}`
`23`	`23`	`}`