From f78262b1a056330a1e332069489d1334ed7d8e04 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 13 Oct 2025 19:21:05 +0300 Subject: [PATCH] Udpate dependencies --- .../org/koitharu/kotatsu/core/BaseApp.kt | 6 --- .../core/util/WorkServiceStopHelper.kt | 46 ------------------- gradle/libs.versions.toml | 12 ++--- 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt index cdaff04b8..d4a3571ec 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt @@ -8,7 +8,6 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.hilt.work.HiltWorkerFactory import androidx.room.InvalidationTracker import androidx.work.Configuration -import androidx.work.WorkManager import dagger.hilt.android.HiltAndroidApp import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow @@ -28,7 +27,6 @@ import org.koitharu.kotatsu.core.db.MangaDatabase import org.koitharu.kotatsu.core.os.AppValidator import org.koitharu.kotatsu.core.os.RomCompat import org.koitharu.kotatsu.core.prefs.AppSettings -import org.koitharu.kotatsu.core.util.WorkServiceStopHelper import org.koitharu.kotatsu.core.util.ext.processLifecycleScope import org.koitharu.kotatsu.local.data.LocalStorageChanges import org.koitharu.kotatsu.local.data.index.LocalMangaIndex @@ -63,9 +61,6 @@ open class BaseApp : Application(), Configuration.Provider { @Inject lateinit var workScheduleManager: WorkScheduleManager - @Inject - lateinit var workManagerProvider: Provider - @Inject lateinit var localMangaIndexProvider: Provider @@ -99,7 +94,6 @@ open class BaseApp : Application(), Configuration.Provider { localStorageChanges.collect(localMangaIndexProvider.get()) } workScheduleManager.init() - WorkServiceStopHelper(workManagerProvider).setup() } override fun attachBaseContext(base: Context) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt deleted file mode 100644 index 09e706895..000000000 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt +++ /dev/null @@ -1,46 +0,0 @@ -package org.koitharu.kotatsu.core.util - -import android.annotation.SuppressLint -import androidx.work.WorkInfo -import androidx.work.WorkManager -import androidx.work.WorkQuery -import androidx.work.impl.foreground.SystemForegroundService -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.launch -import org.koitharu.kotatsu.core.util.ext.processLifecycleScope -import javax.inject.Provider - -/** - * Workaround for issue - * https://issuetracker.google.com/issues/270245927 - * https://issuetracker.google.com/issues/280504155 - */ -class WorkServiceStopHelper( - private val workManagerProvider: Provider, -) { - - fun setup() { - processLifecycleScope.launch(Dispatchers.Default) { - workManagerProvider.get() - .getWorkInfosFlow(WorkQuery.fromStates(WorkInfo.State.RUNNING)) - .map { it.isEmpty() } - .distinctUntilChanged() - .collectLatest { - if (it) { - delay(1_000) - stopWorkerService() - } - } - } - } - - @SuppressLint("RestrictedApi") - private fun stopWorkerService() { - SystemForegroundService.getInstance()?.stop() - } -} - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9dc14c95..74234643a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -acra = "5.12.0" +acra = "5.13.1" activity = "1.11.0" adapterdelegates = "4.3.2" appcompat = "1.7.1" @@ -13,7 +13,7 @@ conscrypt = "2.5.2" constraintlayout = "2.2.1" coreKtx = "1.17.0" coroutines = "1.10.2" -dagger = "2.57.1" +dagger = "2.57.2" decoroutinator = "2.5.7" desugar = "2.1.5" diskLruCache = "1.5" @@ -33,9 +33,9 @@ lifecycle = "2.9.4" markwon = "4.6.2" material = "1.14.0-alpha05" moshi = "1.15.2" -okhttp = "5.1.0" -okio = "3.16.0" -parsers = "f62809407b" +okhttp = "5.2.1" +okio = "3.16.1" +parsers = "8908031eee" preference = "1.2.1" recyclerview = "1.4.0" room = "2.7.2" @@ -47,7 +47,7 @@ testRunner = "1.7.0" transition = "1.6.0" viewpager2 = "1.1.0" webkit = "1.14.0" -workRuntime = "2.10.4" +workRuntime = "2.10.5" workinspector = "1.2" [libraries]