From 7e702695f8ab8aadfd7d55c3259615bd7e23c094 Mon Sep 17 00:00:00 2001 From: Nicolas Presseault <618592+npresseault@users.noreply.github.com> Date: Mon, 6 May 2024 09:58:03 -0400 Subject: [PATCH] Bump dependencies (#10) --- .../com/mirego/viewmodel/pilot/KotlinAndroid.kt | 2 +- .../com/mirego/pilot/components/ui/PilotRichText.kt | 1 - gradle.properties | 1 + gradle/libs.versions.toml | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/mirego/viewmodel/pilot/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/mirego/viewmodel/pilot/KotlinAndroid.kt index 887858ed..40a0b52e 100644 --- a/build-logic/convention/src/main/kotlin/com/mirego/viewmodel/pilot/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/mirego/viewmodel/pilot/KotlinAndroid.kt @@ -11,7 +11,7 @@ private object Constants { } internal fun Project.configureKotlinAndroid( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *, *>, ) { commonExtension.apply { compileSdk = 34 diff --git a/components/common/src/androidMain/kotlin/com/mirego/pilot/components/ui/PilotRichText.kt b/components/common/src/androidMain/kotlin/com/mirego/pilot/components/ui/PilotRichText.kt index 0ab39179..cf66957a 100644 --- a/components/common/src/androidMain/kotlin/com/mirego/pilot/components/ui/PilotRichText.kt +++ b/components/common/src/androidMain/kotlin/com/mirego/pilot/components/ui/PilotRichText.kt @@ -78,5 +78,4 @@ private fun AnnotatedString.Builder.addRangeStyle(range: PilotRichTextRange, tex private fun PilotRichTextRange.toComposeSpanStyle(textStyleResourceProvider: PilotTextStyleResourceProvider): SpanStyle? = when (val currentSpan = span) { is PilotRichTextSpan.Style -> textStyleResourceProvider.textStyleForResource(currentSpan.resource)?.toSpanStyle() - else -> null } diff --git a/gradle.properties b/gradle.properties index 228ea3b4..2330a299 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,5 @@ android.enableJetifier=true android.useAndroidX=true kotlin.native.cacheKind=none kotlin.mpp.stability.nowarn=true +kotlin.mpp.androidGradlePluginCompatibility.nowarn=true version=0.2.11-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 795ed27c..e5288b0f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -kotlin = "1.9.22" -agp = "8.2.2" +kotlin = "1.9.23" +agp = "8.4.0" ktlint = "12.1.0" binary-compatibility = "0.13.2" -androidx-compose-runtime = "1.6.3" +androidx-compose-runtime = "1.6.7" androidx-compose-material3 = "1.2.1" androidx-lifecycle = "2.7.0" androidx-navigation = "2.7.7" -androidx-activity-compose = "1.8.2" -androidx-compose-compiler = "1.5.9" -kotlinx-coroutines = "1.7.3" +androidx-activity-compose = "1.9.0" +androidx-compose-compiler = "1.5.13" +kotlinx-coroutines = "1.8.0" mirego-publish = "1.5" coil = "2.5.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ea3535d..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME