Update dependency org.lighthousegames:logging to v2 (#177)

* Update dependency org.lighthousegames:logging to v2

* Move to new imports

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Syer10 <syer10@users.noreply.github.com>
This commit is contained in:
renovate[bot]
2025-10-07 13:28:45 -04:00
committed by GitHub
parent f9130fe4da
commit 3b072c2d6b
88 changed files with 90 additions and 90 deletions

View File

@@ -16,8 +16,8 @@ import ca.gosyer.jui.android.data.notification.Notifications
import ca.gosyer.jui.core.prefs.Preference
import ca.gosyer.jui.core.prefs.getAsFlow
import ca.gosyer.jui.domain.ui.model.ThemeMode
import com.diamondedge.logging.logging
import kotlinx.coroutines.flow.launchIn
import org.lighthousegames.logging.logging
import java.util.Locale
class App :

View File

@@ -27,6 +27,7 @@ import ca.gosyer.jui.domain.download.model.DownloadStatus
import ca.gosyer.jui.domain.download.service.DownloadService
import ca.gosyer.jui.domain.download.service.DownloadService.Companion.status
import ca.gosyer.jui.i18n.MR
import com.diamondedge.logging.logging
import dev.icerock.moko.resources.desc.desc
import dev.icerock.moko.resources.format
import io.ktor.client.plugins.websocket.ws
@@ -50,7 +51,6 @@ import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.job
import kotlinx.serialization.json.Json
import org.lighthousegames.logging.logging
import java.util.regex.Pattern
class AndroidDownloadService : Service() {

View File

@@ -28,6 +28,7 @@ import ca.gosyer.jui.domain.library.model.UpdateStatus
import ca.gosyer.jui.domain.library.service.LibraryUpdateService
import ca.gosyer.jui.domain.library.service.LibraryUpdateService.Companion.status
import ca.gosyer.jui.i18n.MR
import com.diamondedge.logging.logging
import dev.icerock.moko.resources.desc.desc
import dev.icerock.moko.resources.format
import io.ktor.client.plugins.websocket.ws
@@ -51,7 +52,6 @@ import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.job
import kotlinx.serialization.json.Json
import org.lighthousegames.logging.logging
class AndroidLibraryService : Service() {
companion object {

View File

@@ -13,7 +13,7 @@ import ca.gosyer.jui.uicore.vm.ContextWrapper
import me.tatarka.inject.annotations.Inject
import okio.FileSystem
import okio.Path.Companion.toPath
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class AppMigrations(

View File

@@ -7,6 +7,7 @@
package ca.gosyer.jui.desktop.logging
import ca.gosyer.jui.desktop.build.BuildConfig
import com.diamondedge.logging.logging
import com.github.weisj.darklaf.LafManager
import okio.Path
import org.apache.logging.log4j.Level
@@ -15,7 +16,6 @@ import org.apache.logging.log4j.core.LoggerContext
import org.apache.logging.log4j.core.appender.ConsoleAppender
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory
import org.lighthousegames.logging.KmLogging
import org.lighthousegames.logging.logging
import org.slf4j.bridge.SLF4JBridgeHandler
import java.util.logging.LogManager as JLogManager
@@ -103,7 +103,7 @@ fun initializeLogger(loggingLocation: Path) {
addHandler(SLF4JBridgeHandler())
}
KmLogging.setLogFactory(org.lighthousegames.logging.Slf4jLogFactory())
KmLogging.setLogFactory(com.diamondedge.logging.Slf4jLogFactory())
val log = logging("UncaughtException")
Thread.setDefaultUncaughtExceptionHandler { t, e ->

View File

@@ -6,8 +6,8 @@
package ca.gosyer.jui.desktop.logging
import org.lighthousegames.logging.KmLog
import org.lighthousegames.logging.LogFactory
import com.diamondedge.logging.KmLog
import com.diamondedge.logging.LogFactory
import org.slf4j.Logger
import org.slf4j.LoggerFactory

View File

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ServerListeners {

View File

@@ -11,7 +11,7 @@ import io.ktor.client.request.HttpRequestBuilder
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ExportBackupFile(

View File

@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
import okio.FileSystem
import okio.Path
import okio.SYSTEM
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ImportBackupFile(

View File

@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
import okio.FileSystem
import okio.Path
import okio.SYSTEM
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ValidateBackupFile(

View File

@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.serialization.json.Json
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@OptIn(DelicateCoroutinesApi::class)
abstract class WebsocketService(

View File

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class AddMangaToCategory(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class CreateCategory(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class DeleteCategory(

View File

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetCategories(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.manga.model.Manga
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetMangaCategories(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.flow.take
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetMangaListFromCategory(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ModifyCategory(

View File

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class RemoveMangaFromCategory(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ReorderCategory(

View File

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateCategoryMeta(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.onEach
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.jvm.JvmName
@Inject

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.flow.take
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetChapter(

View File

@@ -11,7 +11,7 @@ import io.ktor.client.request.HttpRequestBuilder
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetChapterPages(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.flow.take
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetChapters(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class RefreshChapters(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.onEach
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.jvm.JvmName
@Inject

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateChapterMeta(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class BatchChapterDownload(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ClearDownloadQueue(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class QueueChapterDownload(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ReorderChapterDownload(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class StartDownloading(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class StopChapterDownload(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class StopDownloading(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetExtensionList(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class InstallExtension(

View File

@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
import okio.FileSystem
import okio.Path
import okio.SYSTEM
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class InstallExtensionFile(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UninstallExtension(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateExtension(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.global.service.GlobalRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetGlobalMeta(

View File

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateGlobalMeta(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class AddMangaToLibrary(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class RemoveMangaFromLibrary(

View File

@@ -14,7 +14,7 @@ import io.ktor.websocket.Frame
import io.ktor.websocket.readText
import kotlinx.coroutines.flow.MutableStateFlow
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class LibraryUpdateService(

View File

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.flow.take
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetManga(

View File

@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.flow.take
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class RefreshManga(

View File

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateMangaMeta(

View File

@@ -30,7 +30,7 @@ import io.ktor.http.URLBuilder
import io.ktor.http.URLProtocol
import io.ktor.serialization.kotlinx.json.json
import kotlinx.serialization.json.Json
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds
import io.ktor.client.plugins.auth.Auth as AuthPlugin

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class AboutServer(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetSettings(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class SetSettings(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetFilterList(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetLatestManga(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetPopularManga(

View File

@@ -12,7 +12,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetSearchManga(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetSourceList(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetSourceSettings(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class SetSourceSetting(

View File

@@ -27,7 +27,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
fun interface GetMangaPage {
suspend fun get(page: Int): MangaPage?

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GetRecentUpdates(

View File

@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateCategory(

View File

@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.singleOrNull
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateChecker(

View File

@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdateLibrary(

View File

@@ -27,7 +27,7 @@ import okio.Path
import okio.Path.Companion.toPath
import okio.buffer
import okio.source
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import java.io.File.pathSeparatorChar
import java.io.IOException
import java.io.Reader

View File

@@ -44,7 +44,7 @@ apolloKtor = "0.1.1"
# Logging
slf4j = "2.0.17"
log4j = "2.25.2"
kmlogging = "1.5.0"
kmlogging = "2.0.3"
# Storage
okio = "3.16.0"

View File

@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class CategoriesScreenViewModel(

View File

@@ -63,7 +63,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
private val log = logging()

View File

@@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class DownloadsScreenViewModel(

View File

@@ -38,7 +38,7 @@ import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Inject
import okio.FileSystem
import okio.Source
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.random.Random
@Inject

View File

@@ -49,7 +49,7 @@ import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Stable
sealed class LibraryState {

View File

@@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.time.Instant
@Inject

View File

@@ -16,7 +16,7 @@ import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.asStateFlow
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class LibraryUpdatesViewModel(

View File

@@ -53,7 +53,7 @@ import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class MangaScreenViewModel(

View File

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.take
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
class ChapterLoader(
private val readerPreferences: ReaderPreferences,

View File

@@ -66,7 +66,7 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class ReaderMenuViewModel(

View File

@@ -49,7 +49,7 @@ import okio.BufferedSource
import okio.FileSystem
import okio.buffer
import okio.use
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
class TachideskPageLoader(
val chapter: ReaderChapter,

View File

@@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.stateIn
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Immutable
data class ReaderChapter(

View File

@@ -54,7 +54,7 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.isActive
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.time.Duration.Companion.seconds
class SettingsAdvancedScreen : Screen {

View File

@@ -95,7 +95,7 @@ import okio.Path
import okio.Sink
import okio.Source
import okio.buffer
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
import kotlin.random.Random
class SettingsBackupScreen : Screen {

View File

@@ -31,7 +31,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
class SourceScreenViewModel(
private val source: Source,

View File

@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.onEach
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
class SourceFiltersViewModel(
private val sourceId: Long,

View File

@@ -41,7 +41,7 @@ import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class GlobalSearchViewModel(

View File

@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.stateIn
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class SourceHomeScreenViewModel(

View File

@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.supervisorScope
import me.tatarka.inject.annotations.Assisted
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class SourceSettingsScreenViewModel(

View File

@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class UpdatesScreenViewModel(

View File

@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.shareIn
import me.tatarka.inject.annotations.Inject
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
@Inject
class TrayViewModel(

View File

@@ -40,7 +40,7 @@ import com.seiko.imageloader.model.ImageRequest
import com.seiko.imageloader.rememberImageAction
import com.seiko.imageloader.rememberImageActionPainter
import com.seiko.imageloader.rememberImagePainter
import org.lighthousegames.logging.logging
import com.diamondedge.logging.logging
private val log = logging()