Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Find and replace

Browse source
This commit is contained in:
Marco Romano 2023-10-13 14:55:12 +02:00
parent 5f56961fd0
commit 0e1a8d506d
5 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gradle/libs.versions.toml
View file

@ -43,7 +43,7 @@ appyx = "1.4.0"
dependencycheck = "8.4.0" dependencycheck = "8.4.0"
dependencyanalysis = "1.25.0" dependencyanalysis = "1.25.0"
stem = "2.3.0" stem = "2.3.0"
sqldelight = "1.5.5" sqldelight = "2.0.0"
telephoto = "0.6.2" telephoto = "0.6.2"
wysiwyg = "2.14.1" wysiwyg = "2.14.1"
@ -146,9 +146,9 @@ timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.62" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.62"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" } matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" } matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-driver-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" } sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
sqlcipher = "net.zetetic:android-database-sqlcipher:4.5.4" sqlcipher = "net.zetetic:android-database-sqlcipher:4.5.4"
sqlite = "androidx.sqlite:sqlite-ktx:2.3.1" sqlite = "androidx.sqlite:sqlite-ktx:2.3.1"
unifiedpush = "com.github.UnifiedPush:android-connector:2.1.1" unifiedpush = "com.github.UnifiedPush:android-connector:2.1.1"
@ -203,7 +203,7 @@ dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencyc
dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyanalysis" } dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyanalysis" }
paparazzi = "app.cash.paparazzi:1.3.1" paparazzi = "app.cash.paparazzi:1.3.1"
kover = "org.jetbrains.kotlinx.kover:0.6.1" kover = "org.jetbrains.kotlinx.kover:0.6.1"
sqldelight = { id = "com.squareup.sqldelight", version.ref = "sqldelight" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
# Version '4.3.1.3277' introduced some regressions in CI time (more than 2x slower), so make sure # Version '4.3.1.3277' introduced some regressions in CI time (more than 2x slower), so make sure
# this is no longer the case before upgrading. # this is no longer the case before upgrading.

4
libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/SqlCipherDriverFactory.kt
View file

@ -17,8 +17,8 @@
package io.element.encrypteddb package io.element.encrypteddb
import android.content.Context import android.content.Context
import com.squareup.sqldelight.android.AndroidSqliteDriver import app.cash.sqldelight.android.AndroidSqliteDriver
import com.squareup.sqldelight.db.SqlDriver import app.cash.sqldelight.db.SqlDriver
import io.element.encrypteddb.passphrase.PassphraseProvider import io.element.encrypteddb.passphrase.PassphraseProvider
import net.sqlcipher.database.SupportFactory import net.sqlcipher.database.SupportFactory

18
libraries/session-storage/impl/build.gradle.kts
View file

@ -50,13 +50,15 @@ dependencies {
} }
sqldelight { sqldelight {
database("SessionDatabase") { databases {
// https://cashapp.github.io/sqldelight/1.5.4/multiplatform_sqlite/migrations/ create("SessionDatabase") {
// To generate a .db file from your latest schema, run this task // https://cashapp.github.io/sqldelight/2.0.0/android_sqlite/migrations/
// ./gradlew generateDebugSessionDatabaseSchema // To generate a .db file from your latest schema, run this task
// Test migration by running // ./gradlew generateDebugSessionDatabaseSchema
// ./gradlew verifySqlDelightMigration // Test migration by running
schemaOutputDirectory = File("src/main/sqldelight/databases") // ./gradlew verifySqlDelightMigration
verifyMigrations = true schemaOutputDirectory = File("src/main/sqldelight/databases")
verifyMigrations = true
}
} }
} }

6
libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
View file

@ -17,9 +17,9 @@
package io.element.android.libraries.sessionstorage.impl package io.element.android.libraries.sessionstorage.impl
import com.squareup.anvil.annotations.ContributesBinding import com.squareup.anvil.annotations.ContributesBinding
import com.squareup.sqldelight.runtime.coroutines.asFlow import app.cash.sqldelight.runtime.coroutines.asFlow
import com.squareup.sqldelight.runtime.coroutines.mapToList import app.cash.sqldelight.runtime.coroutines.mapToList
import com.squareup.sqldelight.runtime.coroutines.mapToOneOrNull import app.cash.sqldelight.runtime.coroutines.mapToOneOrNull
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.SingleIn import io.element.android.libraries.di.SingleIn
import io.element.android.libraries.sessionstorage.api.LoggedInState import io.element.android.libraries.sessionstorage.api.LoggedInState

2
libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
View file

@ -18,7 +18,7 @@ package io.element.android.libraries.sessionstorage.impl
import app.cash.turbine.test import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver import app.cash.sqldelight.sqlite.driver.JdbcSqliteDriver
import io.element.android.libraries.matrix.session.SessionData import io.element.android.libraries.matrix.session.SessionData
import io.element.android.libraries.sessionstorage.api.LoggedInState import io.element.android.libraries.sessionstorage.api.LoggedInState
import io.element.android.libraries.sessionstorage.api.LoginType import io.element.android.libraries.sessionstorage.api.LoginType