diff --git a/app/build.gradle b/app/build.gradle index 5bc4ff384..8bb34d212 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' - id 'org.jlleitschuh.gradle.ktlint' version "11.5.1" + id 'org.jlleitschuh.gradle.ktlint' version "11.6.1" id 'com.google.gms.google-services' } @@ -89,7 +89,7 @@ android { dependencies { implementation project(path: ':quartz') implementation "androidx.core:core-ktx:$core_ktx_version" - implementation 'androidx.activity:activity-compose:1.7.2' + implementation 'androidx.activity:activity-compose:1.8.0' implementation "androidx.compose.ui:ui:$compose_ui_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" @@ -200,10 +200,6 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" } -ktlint { - disabledRules.set(["no-wildcard-imports"]) -} - // https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix // NB: Android Studio can't find the imports; this does not affect the // actual build since Gradle can find them just fine. diff --git a/build.gradle b/build.gradle index 38da04feb..55c8e5fd4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,12 @@ buildscript { ext { fragment_version = "1.6.1" lifecycle_version = '2.6.2' - compose_ui_version = '1.5.2' - nav_version = '2.7.3' + compose_ui_version = '1.5.3' + nav_version = '2.7.4' room_version = "2.4.3" accompanist_version = '0.30.1' coil_version = '2.4.0' - vico_version = '1.11.3' + vico_version = '1.12.0' exoplayer_version = '1.1.1' media3_version = '1.1.1' core_ktx_version = '1.12.0' diff --git a/quartz/build.gradle b/quartz/build.gradle index ca265adfa..233fe4385 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -47,7 +47,7 @@ dependencies { api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2' // immutable collections to avoid recomposition - api("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5") + api("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6") // Parses URLs from Text: api "io.github.url-detector:url-detector:0.1.23"