From 6daf60bc9edcfd12516828ca5d5f76ac6425ecdf Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 15 Nov 2021 23:39:07 +0530 Subject: [PATCH] build: upgrade Compose, Aurora and Coil --- android/build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- desktop/build.gradle.kts | 2 +- desktop/src/jvmMain/kotlin/main.kt | 4 ++-- gradle/libs.versions.toml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index fbf8bb26..27d3882b 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -1,7 +1,7 @@ import java.util.Properties plugins { - id("org.jetbrains.compose") version "1.0.0-beta6-dev450" + id("org.jetbrains.compose") version "1.0.0-beta6-dev462" id("com.android.application") kotlin("android") kotlin("kapt") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 1bf06e67..0eb06ae0 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "1.0.0-beta6-dev450" + id("org.jetbrains.compose") version "1.0.0-beta6-dev462" id("com.android.library") } diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index f5eb1607..60d67c33 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "1.0.0-beta6-dev450" + id("org.jetbrains.compose") version "1.0.0-beta6-dev462" } group = "dev.msfjarvis.claw" diff --git a/desktop/src/jvmMain/kotlin/main.kt b/desktop/src/jvmMain/kotlin/main.kt index e93de27f..7efa8b1d 100644 --- a/desktop/src/jvmMain/kotlin/main.kt +++ b/desktop/src/jvmMain/kotlin/main.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowPlacement import androidx.compose.ui.window.WindowPosition -import androidx.compose.ui.window.application import androidx.compose.ui.window.rememberWindowState import dev.msfjarvis.claw.api.LobstersApi import dev.msfjarvis.claw.common.posts.LobstersCard @@ -25,8 +24,9 @@ import dev.msfjarvis.claw.database.local.SavedPost import org.pushingpixels.aurora.component.AuroraVerticalScrollbar import org.pushingpixels.aurora.theming.ceruleanSkin import org.pushingpixels.aurora.window.AuroraWindow +import org.pushingpixels.aurora.window.auroraApplication -fun main() = application { +fun main() = auroraApplication { val paging = Paging(rememberCoroutineScope()) val items = paging.pagingData.collectAsLazyPagingItems() val urlLauncher = UrlLauncher() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52a4acc1..a60d5f15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] accompanist = "0.21.2-beta" -aurora = "0.0.62-SNAPSHOT" +aurora = "1.0.0-beta1" coroutines = "1.5.2" hilt = "2.40.1" richtext = "0.8.1" -serialization = "1.3.0" +serialization = "1.3.1" sqldelight = "1.5.2" [libraries] @@ -32,7 +32,7 @@ aurora-component = { module = "org.pushing-pixels:aurora-component", version.ref aurora-theming = { module = "org.pushing-pixels:aurora-theming", version.ref = "aurora" } aurora-window = { module = "org.pushing-pixels:aurora-window", version.ref = "aurora" } -coil-compose = "io.coil-kt:coil-compose:2.0.0-alpha02" +coil-compose = "io.coil-kt:coil-compose:2.0.0-alpha03" kamel-image = "com.alialbaali.kamel:kamel-image:0.3.0" compose-richtext-ui = { module = "com.halilibo.compose-richtext:richtext-ui", version.ref = "richtext" }