Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #7501

Merged
merged 4 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation(libs.okio)
implementation(libs.commons.io)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.work.ktx)
implementation(libs.androidx.work.runtime)
implementation(libs.androidx.fragment)
implementation(libs.androidx.localbroadcastmanager)
implementation(libs.jsoup)
Expand Down
2 changes: 1 addition & 1 deletion app/k9mail/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {

implementation(libs.androidx.appcompat)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.work.ktx)
implementation(libs.androidx.work.runtime)
implementation(libs.preferencex)
implementation(libs.timber)
implementation(libs.kotlinx.coroutines.core)
Expand Down
5 changes: 2 additions & 3 deletions app/k9mail/src/main/java/com/fsck/k9/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ class App : Application(), WorkManagerConfiguration.Provider {
.launchIn(appCoroutineScope)
}

override fun getWorkManagerConfiguration(): WorkManagerConfiguration {
return workManagerConfigurationProvider.getConfiguration()
}
override val workManagerConfiguration: WorkManagerConfiguration
get() = workManagerConfigurationProvider.getConfiguration()

companion object {
val appConfig = AppConfig(
Expand Down
2 changes: 1 addition & 1 deletion app/ui/legacy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
implementation(libs.fastadapter.extensions.drag)
implementation(libs.fastadapter.extensions.utils)
implementation(libs.circleimageview)
implementation(libs.androidx.work.ktx)
implementation(libs.androidx.work.runtime)
api(libs.appauth)

implementation(libs.commons.io)
Expand Down
18 changes: 10 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@

[versions]
gradle = "8.5"
androidGradlePlugin = "8.2.0"
androidGradlePlugin = "8.2.1"
ktlint = "1.0.1"

kotlin = "1.9.21"
kotlin = "1.9.22"
kotlinxCoroutines = "1.7.3"
jetbrainsAnnotations = "24.0.1"
androidxAppCompat = "1.6.1"
androidxActivity = "1.8.2"
androidxRecyclerView = "1.3.2"
androidxLifecycle = "2.6.2"
androidxLifecycle = "2.7.0"
androidxNavigation = "2.7.6"
androidxConstraintLayout = "2.1.4"
androidxFragment = "1.6.2"
androidxCore = "1.12.0"
androidxCoreSplashscreen = "1.0.1"
androidxPreference = "1.2.1"
androidxWork = "2.9.0"
androidxDrawerLayout = "1.1.1"
androidxTransition = "1.4.1"
androidxComposeCompiler = "1.5.7"
androidxComposeCompiler = "1.5.8"
# https://developer.android.com/jetpack/compose/bom/bom-mapping
androidxComposeBom = "2023.10.01"
androidxComposeMaterial = "1.5.4"
Expand All @@ -39,13 +40,13 @@ okhttp = "4.12.0"
glide = "4.16.0"
moshi = "1.15.0"
mockito = "5.8.0"
forkhandlesBom = "2.10.2.0"
forkhandlesBom = "2.12.2.0"

[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
ksp = "com.google.devtools.ksp:1.9.21-1.0.16"
ksp = "com.google.devtools.ksp:1.9.22-1.0.16"
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down Expand Up @@ -78,7 +79,8 @@ androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragme
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidxNavigation" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidxConstraintLayout" }
androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
androidx-work-ktx = "androidx.work:work-runtime-ktx:2.8.1"
androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "androidxWork" }
androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidxWork" }
androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidxFragment" }
androidx-localbroadcastmanager = "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" }
Expand Down Expand Up @@ -158,7 +160,7 @@ assertk = "com.willowtreeapps.assertk:assertk-jvm:0.28.0"

leakcanary-android = "com.squareup.leakcanary:leakcanary-android:2.9.1"

detekt-plugin-compose = "io.nlopez.compose.rules:detekt:0.3.5"
detekt-plugin-compose = "io.nlopez.compose.rules:detekt:0.3.9"

[bundles]
shared-jvm-main = [
Expand Down