Move :core to :core:common

2025-06-26 11:07:51 +02:00 · 2024-01-29 15:11:28 +06:00
parent f03f998b21
commit aa498360db
251 changed files with 416 additions and 416 deletions
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@ -15,7 +15,7 @@ android {

 dependencies {
    implementation(projects.sourceApi)
-    implementation(projects.core)
+    implementation(projects.core.common)

    implementation(platform(kotlinx.coroutines.bom))
    implementation(kotlinx.bundles.coroutines)
--- a/domain/src/main/java/tachiyomi/domain/backup/service/BackupPreferences.kt
+++ b/domain/src/main/java/tachiyomi/domain/backup/service/BackupPreferences.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.backup.service

-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore

 class BackupPreferences(
    private val preferenceStore: PreferenceStore,
--- a/domain/src/main/java/tachiyomi/domain/category/interactor/CreateCategoryWithName.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/CreateCategoryWithName.kt
@ -1,8 +1,8 @@
 package tachiyomi.domain.category.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.repository.CategoryRepository
 import tachiyomi.domain.library.service.LibraryPreferences
--- a/domain/src/main/java/tachiyomi/domain/category/interactor/DeleteCategory.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/DeleteCategory.kt
@ -1,8 +1,8 @@
 package tachiyomi.domain.category.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository

--- a/domain/src/main/java/tachiyomi/domain/category/interactor/RenameCategory.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/RenameCategory.kt
@ -1,8 +1,8 @@
 package tachiyomi.domain.category.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
--- a/domain/src/main/java/tachiyomi/domain/category/interactor/ReorderCategory.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/ReorderCategory.kt
@ -3,8 +3,8 @@ package tachiyomi.domain.category.interactor
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
--- a/domain/src/main/java/tachiyomi/domain/category/interactor/SetMangaCategories.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/SetMangaCategories.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.category.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.manga.repository.MangaRepository

 class SetMangaCategories(
--- a/domain/src/main/java/tachiyomi/domain/category/interactor/UpdateCategory.kt
+++ b/domain/src/main/java/tachiyomi/domain/category/interactor/UpdateCategory.kt
@ -1,6 +1,6 @@
 package tachiyomi.domain.category.interactor

-import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.lang.withNonCancellableContext
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository

--- a/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChapter.kt
+++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChapter.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.chapter.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChaptersByMangaId.kt
+++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChaptersByMangaId.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.chapter.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/domain/src/main/java/tachiyomi/domain/chapter/interactor/SetMangaDefaultChapterFlags.kt
+++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/SetMangaDefaultChapterFlags.kt
@ -1,6 +1,6 @@
 package tachiyomi.domain.chapter.interactor

-import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.common.util.lang.withNonCancellableContext
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.manga.interactor.GetFavorites
 import tachiyomi.domain.manga.interactor.SetMangaChapterFlags
--- a/domain/src/main/java/tachiyomi/domain/chapter/interactor/UpdateChapter.kt
+++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/UpdateChapter.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.chapter.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.model.ChapterUpdate
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/domain/src/main/java/tachiyomi/domain/chapter/service/ChapterSort.kt
+++ b/domain/src/main/java/tachiyomi/domain/chapter/service/ChapterSort.kt
@ -1,6 +1,6 @@
 package tachiyomi.domain.chapter.service

-import tachiyomi.core.util.lang.compareToWithCollator
+import tachiyomi.core.common.util.lang.compareToWithCollator
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.manga.model.Manga

--- a/domain/src/main/java/tachiyomi/domain/download/service/DownloadPreferences.kt
+++ b/domain/src/main/java/tachiyomi/domain/download/service/DownloadPreferences.kt
@ -1,6 +1,6 @@
 package tachiyomi.domain.download.service

-import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.common.preference.PreferenceStore

 class DownloadPreferences(
    private val preferenceStore: PreferenceStore,
--- a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
+++ b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
@ -1,9 +1,9 @@
 package tachiyomi.domain.library.service

-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.core.preference.TriState
-import tachiyomi.core.preference.getEnum
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
+import tachiyomi.core.common.preference.TriState
+import tachiyomi.core.common.preference.getEnum
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibrarySort
 import tachiyomi.domain.manga.model.Manga
--- a/domain/src/main/java/tachiyomi/domain/manga/interactor/GetManga.kt
+++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetManga.kt
@ -2,7 +2,7 @@ package tachiyomi.domain.manga.interactor

 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.repository.MangaRepository

--- a/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt
+++ b/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt
@ -2,7 +2,7 @@ package tachiyomi.domain.manga.model

 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
-import tachiyomi.core.preference.TriState
+import tachiyomi.core.common.preference.TriState
 import java.io.Serializable
 import java.time.Instant

--- a/domain/src/main/java/tachiyomi/domain/manga/model/TriState.kt
+++ b/domain/src/main/java/tachiyomi/domain/manga/model/TriState.kt
@ -1,6 +1,6 @@
 package tachiyomi.domain.manga.model

-import tachiyomi.core.preference.TriState
+import tachiyomi.core.common.preference.TriState

 inline fun applyFilter(filter: TriState, predicate: () -> Boolean): Boolean = when (filter) {
    TriState.DISABLED -> true
--- a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
+++ b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.release.interactor

-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.domain.release.model.Release
 import tachiyomi.domain.release.service.ReleaseService
 import java.time.Instant
--- a/domain/src/main/java/tachiyomi/domain/storage/service/StoragePreferences.kt
+++ b/domain/src/main/java/tachiyomi/domain/storage/service/StoragePreferences.kt
@ -1,8 +1,8 @@
 package tachiyomi.domain.storage.service

-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.core.storage.FolderProvider
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
+import tachiyomi.core.common.storage.FolderProvider

 class StoragePreferences(
    private val folderProvider: FolderProvider,
--- a/domain/src/main/java/tachiyomi/domain/track/interactor/DeleteTrack.kt
+++ b/domain/src/main/java/tachiyomi/domain/track/interactor/DeleteTrack.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.track.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.track.repository.TrackRepository

 class DeleteTrack(
--- a/domain/src/main/java/tachiyomi/domain/track/interactor/GetTracks.kt
+++ b/domain/src/main/java/tachiyomi/domain/track/interactor/GetTracks.kt
@ -2,7 +2,7 @@ package tachiyomi.domain.track.interactor

 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.track.model.Track
 import tachiyomi.domain.track.repository.TrackRepository

--- a/domain/src/main/java/tachiyomi/domain/track/interactor/InsertTrack.kt
+++ b/domain/src/main/java/tachiyomi/domain/track/interactor/InsertTrack.kt
@ -1,7 +1,7 @@
 package tachiyomi.domain.track.interactor

 import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
+import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.track.model.Track
 import tachiyomi.domain.track.repository.TrackRepository

--- a/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt
+++ b/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt
@ -8,8 +8,8 @@ import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.domain.release.model.Release
 import tachiyomi.domain.release.service.ReleaseService
 import java.time.Instant