diff --git a/android/build.gradle.kts b/android/build.gradle.kts index d027422e..af97973b 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-dev474" + id("org.jetbrains.compose") version "1.0.0-rc4" id("com.android.application") kotlin("android") kotlin("kapt") diff --git a/build.gradle.kts b/build.gradle.kts index 839d471c..09ad4bad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,30 +12,30 @@ buildscript { } } dependencies { - classpath("com.android.tools:r8:3.2.16-dev") + classpath("com.android.tools:r8:3.2.28-dev") classpath(kotlin("gradle-plugin", version = kotlinVersion)) classpath(kotlin("serialization", version = kotlinVersion)) classpath("com.android.tools.build:gradle:7.0.3") classpath("com.diffplug.spotless:spotless-plugin-gradle:6.0.0") - classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.1") + classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.2") } } +plugins { id("com.diffplug.spotless") version "6.0.0" } + group = "dev.msfjarvis.claw" version = "1.0" -apply(plugin = "com.diffplug.spotless") - configure { kotlin { target("**/*.kt") targetExclude("**/build/**") - ktfmt("0.29").googleStyle() + ktfmt("0.30").googleStyle() } kotlinGradle { target("**/*.gradle.kts") - ktfmt("0.29").googleStyle() + ktfmt("0.30").googleStyle() } } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index d5e99a6d..6e461b09 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-dev474" + id("org.jetbrains.compose") version "1.0.0-rc4" id("com.android.library") } diff --git a/database/build.gradle.kts b/database/build.gradle.kts index 336fe336..b33c271c 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("multiplatform") id("com.android.library") - id("com.squareup.sqldelight") version "1.5.2" + id("com.squareup.sqldelight") version "1.5.3" } kotlin { diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 91234971..2e968950 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-dev474" + id("org.jetbrains.compose") version "1.0.0-rc4" } group = "dev.msfjarvis.claw" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e4f42cb5..524bafa4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] accompanist = "0.21.3-beta" -aurora = "1.0.0-beta1" +aurora = "1.0.0-beta2" coroutines = "1.5.2" -hilt = "2.40.1" -richtext = "0.8.1" +hilt = "2.40.2" +richtext = "0.9.0" serialization = "1.3.1" -sqldelight = "1.5.2" +sqldelight = "1.5.3" [libraries] @@ -54,4 +54,4 @@ sqldelight-jvmDriver = { module = "com.squareup.sqldelight:sqlite-driver", versi sqldelight-androidDriver = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-extensions-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" } -testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2" +testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.3"