From 28ad328acad56ac90abc6989714203a2795876a8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 20 Sep 2026 14:55:23 +0000 Subject: [PATCH 1/2] Update sqldelight to v2.4.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36edea6caa7..f7b56c238f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -65,7 +65,7 @@ reorderable = "3.1.0" rxJava = "1.3.8" shizuku = "13.1.5" spotless = "8.10.2" -sqldelight = "2.3.2" +sqldelight = "2.4.0" sqldelight-androidx-driver = "0.2.2" stringSimilarity = "0.1.0" subsamplingScaleImageView = "94915e6f73" From 037fe6960eaf85cedaa6f294b512b1348f9bc6c0 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sun, 20 Sep 2026 21:08:15 +0600 Subject: [PATCH 2/2] fix build --- .../data/backup/restore/restorers/MangaRestorer.kt | 10 ++++------ .../tachiyomi/data/chapter/ChapterRepositoryImpl.kt | 3 +-- .../java/tachiyomi/data/manga/MangaRepositoryImpl.kt | 9 +++------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt index 2c12099c640..99b5ddfa0d9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt @@ -13,8 +13,6 @@ import eu.kanade.tachiyomi.data.backup.models.BackupTracking import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import tachiyomi.data.Database -import tachiyomi.data.MemoColumnAdapter -import tachiyomi.data.UpdateStrategyColumnAdapter import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId import tachiyomi.domain.chapter.model.Chapter @@ -115,7 +113,7 @@ class MangaRestorer( artist = manga.artist, author = manga.author, description = manga.description, - genre = manga.genre?.joinToString(separator = ", "), + genre = manga.genre, title = manga.title, status = manga.status, thumbnailUrl = manga.thumbnailUrl, @@ -129,11 +127,11 @@ class MangaRestorer( coverLastModified = manga.coverLastModified, dateAdded = manga.dateAdded, mangaId = manga.id, - updateStrategy = manga.updateStrategy.let(UpdateStrategyColumnAdapter::encode), + updateStrategy = manga.updateStrategy, version = manga.version, isSyncing = 1, notes = manga.notes, - memo = manga.memo.let(MemoColumnAdapter::encode), + memo = manga.memo, ) return manga } @@ -231,7 +229,7 @@ class MangaRestorer( chapterId = chapter.id, version = chapter.version, isSyncing = 0, - memo = chapter.memo.let(MemoColumnAdapter::encode), + memo = chapter.memo, ) } } diff --git a/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt index 9ee0baec81d..d32ed0dfae8 100644 --- a/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt @@ -13,7 +13,6 @@ import logcat.LogPriority import tachiyomi.core.common.util.lang.toLong import tachiyomi.core.common.util.system.logcat import tachiyomi.data.Database -import tachiyomi.data.MemoColumnAdapter import tachiyomi.data.subscribeToList import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.ChapterUpdate @@ -81,7 +80,7 @@ class ChapterRepositoryImpl( chapterId = chapterUpdate.id, version = chapterUpdate.version, isSyncing = 0, - memo = chapterUpdate.memo?.let(MemoColumnAdapter::encode), + memo = chapterUpdate.memo, ) } } diff --git a/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt index f39bbf83c02..afaefc3b791 100644 --- a/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt @@ -14,9 +14,6 @@ import kotlinx.datetime.toLocalDateTime import logcat.LogPriority import tachiyomi.core.common.util.system.logcat import tachiyomi.data.Database -import tachiyomi.data.MemoColumnAdapter -import tachiyomi.data.StringListColumnAdapter -import tachiyomi.data.UpdateStrategyColumnAdapter import tachiyomi.data.subscribeToList import tachiyomi.data.subscribeToOne import tachiyomi.data.subscribeToOneOrNull @@ -198,7 +195,7 @@ class MangaRepositoryImpl( artist = value.artist, author = value.author, description = value.description, - genre = value.genre?.let(StringListColumnAdapter::encode), + genre = value.genre, title = value.title, status = value.status, thumbnailUrl = value.thumbnailUrl, @@ -212,11 +209,11 @@ class MangaRepositoryImpl( coverLastModified = value.coverLastModified, dateAdded = value.dateAdded, mangaId = value.id, - updateStrategy = value.updateStrategy?.let(UpdateStrategyColumnAdapter::encode), + updateStrategy = value.updateStrategy, version = value.version, isSyncing = 0, notes = value.notes, - memo = value.memo?.let(MemoColumnAdapter::encode), + memo = value.memo, ) } }