From 03518dd9b4ee8c8cf124fe0c8fb72522787c20c4 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 5 Nov 2024 08:43:37 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle | 31 ++++++++++--------- .../kotatsu/core/util/ext/WorkManager.kt | 4 +-- .../download/ui/worker/DownloadWorker.kt | 4 --- build.gradle | 4 +-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a8199df8..9d069b4b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,31 +87,32 @@ dependencies { } coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2' - implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.20' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.21' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0' implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' implementation 'androidx.activity:activity-ktx:1.9.3' implementation 'androidx.fragment:fragment-ktx:1.8.5' implementation 'androidx.transition:transition-ktx:1.5.1' - implementation 'androidx.collection:collection-ktx:1.4.4' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6' - implementation 'androidx.lifecycle:lifecycle-service:2.8.6' - implementation 'androidx.lifecycle:lifecycle-process:2.8.6' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.collection:collection-ktx:1.4.5' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7' + implementation 'androidx.lifecycle:lifecycle-service:2.8.7' + implementation 'androidx.lifecycle:lifecycle-process:2.8.7' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.viewpager2:viewpager2:1.1.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05' implementation 'com.google.android.material:material:1.12.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.6' - implementation 'androidx.webkit:webkit:1.11.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.7' + implementation 'androidx.webkit:webkit:1.12.1' - implementation 'androidx.work:work-runtime:2.9.1' + implementation 'androidx.work:work-runtime:2.10.0' //noinspection GradleDependency - implementation('com.google.guava:guava:33.2.1-android') { + implementation('com.google.guava:guava:33.3.1-android') { exclude group: 'com.google.guava', module: 'failureaccess' exclude group: 'org.checkerframework', module: 'checker-qual' exclude group: 'com.google.j2objc', module: 'j2objc-annotations' @@ -143,10 +144,10 @@ dependencies { implementation 'com.github.solkin:disk-lru-cache:1.4' implementation 'io.noties.markwon:core:4.6.2' - implementation 'ch.acra:acra-http:5.11.4' - implementation 'ch.acra:acra-dialog:5.11.4' + implementation 'ch.acra:acra-http:5.12.0' + implementation 'ch.acra:acra-dialog:5.12.0' - implementation 'org.conscrypt:conscrypt-android:2.5.2' + implementation 'org.conscrypt:conscrypt-android:2.5.3' debugImplementation 'com.squareup.leakcanary:leakcanary-android:3.0-alpha-8' debugImplementation 'com.github.Koitharu:WorkInspector:5778dd1747' @@ -155,7 +156,7 @@ dependencies { testImplementation 'org.json:json:20240303' testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0' - androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test:runner:1.6.2' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:core-ktx:1.6.1' androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1' diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt index d83a4f560..f6e04b8b6 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt @@ -6,9 +6,9 @@ import androidx.work.WorkInfo import androidx.work.WorkManager import androidx.work.WorkQuery import androidx.work.WorkRequest -import androidx.work.await import androidx.work.impl.WorkManagerImpl import androidx.work.impl.model.WorkSpec +import kotlinx.coroutines.guava.await import java.util.UUID import kotlin.coroutines.resume import kotlin.coroutines.resumeWithException @@ -63,7 +63,7 @@ suspend fun WorkManager.awaitWorkInfoById(id: UUID): WorkInfo? { @SuppressLint("RestrictedApi") suspend fun WorkManager.awaitUniqueWorkInfoByName(name: String): List { - return getWorkInfosForUniqueWork(name).await().orEmpty() + return getWorkInfosForUniqueWork(name).await() } @SuppressLint("RestrictedApi") diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt index d0884544e..ccb79fea3 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt @@ -535,10 +535,6 @@ class DownloadWorker @AssistedInject constructor( const val MAX_PAGES_PARALLELISM = 4 const val DOWNLOAD_ERROR_DELAY = 2_000L const val MAX_RETRY_DELAY = 7_200_000L // 2 hours - const val MANGA_ID = "manga_id" - const val CHAPTERS_IDS = "chapters" - const val IS_SILENT = "silent" - const val START_PAUSED = "paused" const val TAG = "download" } } diff --git a/build.gradle b/build.gradle index 5ead0cda7..06e9a988e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21' classpath 'com.google.dagger:hilt-android-gradle-plugin:2.52' - classpath 'com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.20-1.0.25' + classpath 'com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.21-1.0.26' } }