diff --git a/app/build.gradle b/app/build.gradle index f8e670757..e6ed611bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -162,7 +162,7 @@ dependencies { def room_version = "2.5.0-rc01" implementation "androidx.room:room-runtime:$room_version" - annotationProcessor "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-paging:$room_version" implementation 'androidx.startup:startup-runtime:1.2.0-alpha01' diff --git a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt index 780c20fb7..3c4227c79 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt @@ -1,23 +1,20 @@ -package com.hippo.ehviewer.dao; +package com.hippo.ehviewer.dao -import androidx.room.Database; -import androidx.room.RoomDatabase; +import androidx.room.Database +import androidx.room.RoomDatabase -@Database(entities = {BookmarkInfo.class, DownloadInfo.class, DownloadLabel.class, DownloadDirname.class, Filter.class, HistoryInfo.class, LocalFavoriteInfo.class, QuickSearch.class}, version = 4, exportSchema = false) -public abstract class EhDatabase extends RoomDatabase { - public abstract BookmarksDao bookmarksBao(); - - public abstract DownloadDirnameDao downloadDirnameDao(); - - public abstract DownloadLabelDao downloadLabelDao(); - - public abstract DownloadsDao downloadsDao(); - - public abstract FilterDao filterDao(); - - public abstract HistoryDao historyDao(); - - public abstract LocalFavoritesDao localFavoritesDao(); - - public abstract QuickSearchDao quickSearchDao(); +@Database( + entities = [BookmarkInfo::class, DownloadInfo::class, DownloadLabel::class, DownloadDirname::class, Filter::class, HistoryInfo::class, LocalFavoriteInfo::class, QuickSearch::class], + version = 4, + exportSchema = false +) +abstract class EhDatabase : RoomDatabase() { + abstract fun bookmarksBao(): BookmarksDao? + abstract fun downloadDirnameDao(): DownloadDirnameDao? + abstract fun downloadLabelDao(): DownloadLabelDao? + abstract fun downloadsDao(): DownloadsDao? + abstract fun filterDao(): FilterDao? + abstract fun historyDao(): HistoryDao? + abstract fun localFavoritesDao(): LocalFavoritesDao? + abstract fun quickSearchDao(): QuickSearchDao? }