Skip to content

refactor: migrate to room3 #81

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
OffRange merged 4 commits into from
Aug 25, 2026
Merged

refactor: migrate to room3 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee29f39
refactor(core:item): route repository writes through TransactionRunner
OffRange Aug 25, 2026
8dd7760
refactor(core:item): migrate Room 2 to Room 3
OffRange Aug 25, 2026
9b5ceb9
chore: drop Room 2 from the version catalog
OffRange Aug 25, 2026
9449680
Merge branch 'v2' into refactor/migrate-room3
OffRange Aug 25, 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
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.androidx.room) apply false
alias(libs.plugins.androidx.room3) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.kotlin.compose) apply false
Expand Down
9 changes: 4 additions & 5 deletions core/item/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.keygo.android.compose)
alias(libs.plugins.keygo.android.protobuf)
alias(libs.plugins.androidx.room)
alias(libs.plugins.androidx.room3)
alias(libs.plugins.google.ksp)
}

Expand All @@ -19,9 +19,8 @@ android {

dependencies {
// Room
implementation(libs.androidx.room.runtime)
implementation(libs.androidx.room.ktx)
ksp(libs.androidx.room.compiler)
implementation(libs.androidx.room3.runtime)
ksp(libs.androidx.room3.compiler)

implementation(projects.automation)
ksp(projects.automationProcessor)
Expand All @@ -44,7 +43,7 @@ dependencies {
}
}

room {
room3 {
schemaDirectory("$projectDir/schemas")
}

Expand Down
4 changes: 3 additions & 1 deletion core/item/consumer-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@
}

# DataStore Proto
-keep class androidx.datastore.** { *; }
-keep class androidx.datastore.** { *; }

-keep class * extends androidx.room3.RoomDatabase { <init>(); }
6 changes: 3 additions & 3 deletions .../item/src/main/kotlin/de/davis/keygo/core/item/data/local/converter/YearMonthConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package de.davis.keygo.core.item.data.local.converter

import androidx.room.TypeConverter
import androidx.room3.ColumnTypeConverter
import java.time.YearMonth

internal object YearMonthConverter {

@TypeConverter
@ColumnTypeConverter
fun fromYearMonth(yearMonth: YearMonth?): Int? = yearMonth?.let {
yearMonth.year * 100 + yearMonth.monthValue
}

@TypeConverter
@ColumnTypeConverter
fun fromInt(value: Int?): YearMonth? = value?.let {
YearMonth.of(it / 100, it % 100)
}
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/CreditCardDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Transaction
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.CreditCardEntity
import de.davis.keygo.core.item.data.local.pojo.CreditCardProjection
import de.davis.keygo.core.item.domain.alias.ItemId
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/DomainInfoDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Transaction
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.DomainInfoEntity
import de.davis.keygo.core.item.domain.alias.ItemId

Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/ItemDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Transaction
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.ItemEntity
import de.davis.keygo.core.item.data.local.pojo.ItemWrappedKeyRecord
import de.davis.keygo.core.item.data.local.pojo.LightweightItem
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/LoginDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Transaction
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.LoginEntity
import de.davis.keygo.core.item.data.local.pojo.LightweightLogin
import de.davis.keygo.core.item.data.local.pojo.LoginProjection
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/PasskeyDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Transaction
import androidx.room3.Dao
import androidx.room3.Insert
import androidx.room3.Query
import androidx.room3.Transaction
import de.davis.keygo.core.item.data.local.entity.credential.PasskeyEntity
import de.davis.keygo.core.item.data.local.pojo.PasskeyMetadataPojo
import de.davis.keygo.core.item.domain.alias.ItemId
Expand Down
6 changes: 3 additions & 3 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/PasswordDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.credential.PasswordEntity
import de.davis.keygo.core.item.data.local.pojo.PasswordScoreProjection
import de.davis.keygo.core.item.domain.alias.ItemId
Expand Down
10 changes: 5 additions & 5 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/TagDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Transaction
import androidx.room3.Dao
import androidx.room3.Insert
import androidx.room3.OnConflictStrategy
import androidx.room3.Query
import androidx.room3.Transaction
import de.davis.keygo.core.item.data.local.entity.TagCrossRef
import de.davis.keygo.core.item.data.local.entity.TagEntity
import de.davis.keygo.core.item.data.local.pojo.ItemTagProjection
Expand Down
6 changes: 3 additions & 3 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/TotpDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Query
import androidx.room.Upsert
import androidx.room3.Dao
import androidx.room3.Query
import androidx.room3.Upsert
import de.davis.keygo.core.item.data.local.entity.credential.TotpEntity
import de.davis.keygo.core.item.domain.alias.ItemId

Expand Down
10 changes: 5 additions & 5 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/dao/VaultDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.davis.keygo.core.item.data.local.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Update
import androidx.room3.Dao
import androidx.room3.Insert
import androidx.room3.OnConflictStrategy
import androidx.room3.Query
import androidx.room3.Update
import de.davis.keygo.core.item.data.local.entity.KeyInformation
import de.davis.keygo.core.item.data.local.entity.VaultEntity
import de.davis.keygo.core.item.data.local.pojo.VaultMetadata
Expand Down
18 changes: 10 additions & 8 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/datasource/ItemDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package de.davis.keygo.core.item.data.local.datasource

import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import androidx.room3.ColumnTypeConverters
import androidx.room3.Database
import androidx.room3.Room
import androidx.room3.RoomDatabase
import androidx.sqlite.driver.AndroidSQLiteDriver
import de.davis.keygo.core.item.data.local.converter.YearMonthConverter
import de.davis.keygo.core.item.data.local.dao.CreditCardDao
import de.davis.keygo.core.item.data.local.dao.DomainInfoDao
Expand Down Expand Up @@ -43,7 +44,7 @@ import org.koin.core.annotation.Single
],
version = 1,
)
@TypeConverters(YearMonthConverter::class)
@ColumnTypeConverters(YearMonthConverter::class)
internal abstract class ItemDatabase : RoomDatabase() {

abstract fun vaultDao(): VaultDao
Expand All @@ -69,11 +70,12 @@ internal class DatabaseModule {

@Single
fun provideDatabase(context: Context): ItemDatabase =
Room.databaseBuilder(
Room.databaseBuilder<ItemDatabase>(
context,
ItemDatabase::class.java,
"keygo_database",
).build()
)
.setDriver(AndroidSQLiteDriver())
.build()

@Single
fun provideVaultDao(db: ItemDatabase) = db.vaultDao()
Expand Down
10 changes: 5 additions & 5 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/CreditCardEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.PrimaryKey
import androidx.room3.ColumnInfo
import androidx.room3.Embedded
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.domain.alias.ItemId
import de.davis.keygo.core.item.domain.model.EncryptedPayload
import java.time.YearMonth
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/DomainInfoEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.Index
import androidx.room3.ColumnInfo
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.Index
import de.davis.keygo.core.item.domain.alias.ItemId

@Entity(
Expand Down
12 changes: 6 additions & 6 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/ItemEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.Index
import androidx.room.PrimaryKey
import androidx.room3.ColumnInfo
import androidx.room3.Embedded
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.Index
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.domain.alias.ItemId
import de.davis.keygo.core.item.domain.alias.VaultId
import de.davis.keygo.core.item.generated.domain.model.VaultItemType
Expand Down
2 changes: 1 addition & 1 deletion core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/KeyInformation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room3.ColumnInfo

internal class KeyInformation(
@ColumnInfo(name = "wrapped_key")
Expand Down
6 changes: 3 additions & 3 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/LoginEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.PrimaryKey
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.domain.alias.ItemId

@Entity(
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/TagCrossRef.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.Index
import androidx.room3.ColumnInfo
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.Index
import de.davis.keygo.core.item.domain.alias.ItemId

@Entity(
Expand Down
6 changes: 3 additions & 3 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/TagEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.Entity
import androidx.room.Index
import androidx.room.PrimaryKey
import androidx.room3.Entity
import androidx.room3.Index
import androidx.room3.PrimaryKey

@Entity(
tableName = "tag",
Expand Down
2 changes: 1 addition & 1 deletion core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/Timestamp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room3.ColumnInfo

internal data class Timestamp(
@ColumnInfo("created_at")
Expand Down
8 changes: 4 additions & 4 deletions core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/VaultEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.davis.keygo.core.item.data.local.entity

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.PrimaryKey
import androidx.room3.ColumnInfo
import androidx.room3.Embedded
import androidx.room3.Entity
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.domain.alias.VaultId
import de.davis.keygo.core.item.domain.model.Vault

Expand Down
12 changes: 6 additions & 6 deletions ...em/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/credential/PasskeyEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package de.davis.keygo.core.item.data.local.entity.credential

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.Index
import androidx.room.PrimaryKey
import androidx.room3.ColumnInfo
import androidx.room3.Embedded
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.Index
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.data.local.entity.LoginEntity
import de.davis.keygo.core.item.domain.alias.ItemId
import de.davis.keygo.core.item.domain.model.EncryptedPayload
Expand Down
10 changes: 5 additions & 5 deletions ...m/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/credential/PasswordEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.davis.keygo.core.item.data.local.entity.credential

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.PrimaryKey
import androidx.room3.ColumnInfo
import androidx.room3.Embedded
import androidx.room3.Entity
import androidx.room3.ForeignKey
import androidx.room3.PrimaryKey
import de.davis.keygo.core.item.data.local.entity.LoginEntity
import de.davis.keygo.core.item.domain.alias.ItemId
import de.davis.keygo.core.item.domain.model.EncryptedPayload
Expand Down
Loading
Loading