Skip to content

Update sqldelight to v2.4.0 #3985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AntsyLich merged 2 commits into from
Sep 20, 2026
+9 −15
Merged

Update sqldelight to v2.4.0 #3985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ad328
Update sqldelight to v2.4.0
renovate-bot Sep 20, 2026
037fe69
fix build
AntsyLich Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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
}
Expand Down Expand Up @@ -231,7 +229,7 @@ class MangaRestorer(
chapterId = chapter.id,
version = chapter.version,
isSyncing = 0,
memo = chapter.memo.let(MemoColumnAdapter::encode),
memo = chapter.memo,
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -81,7 +80,7 @@ class ChapterRepositoryImpl(
chapterId = chapterUpdate.id,
version = chapterUpdate.version,
isSyncing = 0,
memo = chapterUpdate.memo?.let(MemoColumnAdapter::encode),
memo = chapterUpdate.memo,
)
}
}
Expand Down
9 changes: 3 additions & 6 deletions data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down