Skip to content

Update SQLite to 3.48.1 #234

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
illarionov merged 1 commit into from
Jan 27, 2025
Merged

Update SQLite to 3.48.1 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-embedder-chasm:0.1-alpha04")

// Sqlite WebAssembly binary
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-346:0.1-alpha05")
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-348:0.4")
}
```

Expand Down Expand Up @@ -236,7 +236,7 @@ dependencies {
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-embedder-chicory:0.1-alpha04")

// Sqlite WebAssembly binary
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-346:0.1-alpha05")
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-348:0.4")
}
```

Expand Down Expand Up @@ -281,7 +281,7 @@ dependencies {
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-embedder-chasm:0.1-alpha04")

// Sqlite WebAssembly binary
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-346:0.1-alpha05")
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-348:0.4")
}
```

Expand Down Expand Up @@ -431,7 +431,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType

dependencies {
constraints {
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-346:*") {
testImplementation("ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-348:*") {
attributes {
attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
}
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ androidx-test = "1.6.2"
androidx-test-core = "1.6.1"
androidx-test-rules = "1.6.1"
atomicfu = "0.27.0"
arrow = "2.0.0"
arrow = "2.0.1"
assertk = "0.28.1"
chasm = "0.9.42"
chicory = "1.0.0"
desugar_jdk_libs = "2.1.4"
detekt = "1.23.7"
diktat = "2.0.0"
dokka = "2.0.0"
graalvm = "24.1.1"
graalvm = "24.1.2"
gradle-maven-publish-plugin = "0.30.0"
kotlin = "2.1.0"
kotlinx-coroutines = "1.10.1"
Expand All @@ -32,8 +32,8 @@ kermit = "2.0.5"
ksp = "2.1.0-1.0.29"
mockk = "1.13.16"
spotless = "7.0.0"
sqlite-wasm-binary = "0.3"
wasi-emscripten-host = "0.2"
sqlite-wasm-binary = "0.4"
wasi-emscripten-host = "0.3-SNAPSHOT"

[libraries]
androidx-collection = { group = "androidx.collection", name = "collection", version.ref = "androidx-collection" }
Expand Down Expand Up @@ -77,10 +77,10 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
kotlinx-io = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
wsoh-sqlite-mt = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-android-wasm-emscripten-icu-mt-pthread-346", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-st = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-android-wasm-emscripten-icu-346", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-mt-plain = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-wasm-emscripten-mt-pthread-346", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-st-plain = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-wasm-emscripten-346", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-mt = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-android-wasm-emscripten-icu-mt-pthread-348", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-st = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-android-wasm-emscripten-icu-348", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-mt-plain = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-wasm-emscripten-mt-pthread-348", version.ref = "sqlite-wasm-binary" }
wsoh-sqlite-st-plain = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-wasm-emscripten-348", version.ref = "sqlite-wasm-binary" }
wsoh-binary-base = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "sqlite-binary-api", version.ref = "sqlite-wasm-binary" }
wsoh-binary-reader = { group = "ru.pixnews.wasm-sqlite-open-helper", name = "wasm-binary-reader", version.ref = "sqlite-wasm-binary" }
wasi-emscripten-host = { group = "at.released.weh", name = "host", version.ref = "wasi-emscripten-host" }
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ dependencies {
coreLibraryDesugaring(libs.desugar.jdk.libs)
constraints {
listOf(
"ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-346:*",
"ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-mt-pthread-346:*",
"ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-348:*",
"ru.pixnews.wasm-sqlite-open-helper:sqlite-android-wasm-emscripten-icu-mt-pthread-348:*",
).forEach { dependency ->
testImplementation(dependency) {
attributes {
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidInstrumentedTest/kotlin/chasm/ChasmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ru.pixnews.wasm.sqlite.driver.chasm

import androidx.test.platform.app.InstrumentationRegistry
import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -17,7 +17,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmRuntime
import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmSqliteEmbedder

object ChasmSqliteDriverFactory : TestSqliteDriverFactory<WasmSQLiteDriver<ChasmRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348
override fun create(
dbLogger: Logger,
sqlite3Binary: WasmSqliteConfiguration,
Expand Down
4 changes: 2 additions & 2 deletions ...c/androidInstrumentedTest/kotlin/chicory/ChicoryAndroidInstrumentedSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ru.pixnews.wasm.sqlite.driver.chicory

import androidx.test.platform.app.InstrumentationRegistry
import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -18,7 +18,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chicory.ChicorySqliteEmbedder

object ChicoryAndroidInstrumentedSqliteDriverFactory :
TestSqliteDriverFactory<WasmSQLiteDriver<ChicoryRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348
override fun create(
dbLogger: Logger,
sqlite3Binary: WasmSqliteConfiguration,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidInstrumentedTest/kotlin/graalvm/GraalvmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package ru.pixnews.wasm.sqlite.driver.graalvm
import androidx.test.platform.app.InstrumentationRegistry
import at.released.weh.common.api.Logger
import org.graalvm.polyglot.Engine
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -19,7 +19,7 @@ import ru.pixnews.wasm.sqlite.open.helper.graalvm.GraalvmSqliteEmbedder

class GraalvmSqliteDriverFactory(
private val initialGraalvmEngine: Engine? = WASM_GRAALVM_ENGINE,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread346,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread348,
) : TestSqliteDriverFactory<WasmSQLiteDriver<GraalvmRuntime>> {
override fun create(
dbLogger: Logger,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidUnitTest/kotlin/chasm/ChasmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package ru.pixnews.wasm.sqlite.driver.chasm

import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -16,7 +16,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmRuntime
import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmSqliteEmbedder

object ChasmSqliteDriverFactory : TestSqliteDriverFactory<WasmSQLiteDriver<ChasmRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348
override fun create(
dbLogger: Logger,
sqlite3Binary: WasmSqliteConfiguration,
Expand Down
4 changes: 2 additions & 2 deletions ...te-driver/src/androidUnitTest/kotlin/chicory/ChicoryAndroidUnitTestSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package ru.pixnews.wasm.sqlite.driver.chicory

import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -16,7 +16,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chicory.ChicoryRuntime
import ru.pixnews.wasm.sqlite.open.helper.chicory.ChicorySqliteEmbedder

object ChicoryAndroidUnitTestSqliteDriverFactory : TestSqliteDriverFactory<WasmSQLiteDriver<ChicoryRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348

override fun create(
dbLogger: Logger,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidUnitTest/kotlin/graalvm/GraalvmBaseSqliteDriverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import org.junit.Test
import org.junit.experimental.runners.Enclosed
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.test.base.tests.AbstractBasicSqliteDriverTest

Expand All @@ -34,7 +34,7 @@ class GraalvmBaseSqliteDriverTest {

class SingleThreadedSqliteTest : AbstractBasicSqliteDriverTest<WasmSQLiteDriver<*>>(
driverCreator = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu346,
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu348,
),
) {
@JvmField
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidUnitTest/kotlin/graalvm/GraalvmBasicRoomTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.junit.Rule
import org.junit.experimental.runners.Enclosed
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.AndroidUserDatabaseSuspendFactory
import ru.pixnews.wasm.sqlite.driver.test.base.tests.room.AbstractBasicRoomTest
Expand All @@ -30,7 +30,7 @@ class GraalvmBasicRoomTest {

class SingleThreadedSqliteTest : AbstractBasicRoomTest<WasmSQLiteDriver<*>>(
driverFactory = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu346,
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu348,
),
databaseFactory = AndroidUserDatabaseSuspendFactory,
) {
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/androidUnitTest/kotlin/graalvm/GraalvmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ru.pixnews.wasm.sqlite.driver.graalvm

import at.released.weh.common.api.Logger
import org.graalvm.polyglot.Engine
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -18,7 +18,7 @@ import ru.pixnews.wasm.sqlite.open.helper.graalvm.GraalvmSqliteEmbedder

class GraalvmSqliteDriverFactory(
private val initialGraalvmEngine: Engine? = WASM_GRAALVM_ENGINE,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread346,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread348,
) : TestSqliteDriverFactory<WasmSQLiteDriver<GraalvmRuntime>> {
override fun create(
dbLogger: Logger,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/appleTest/kotlin/chasm/ChasmAppleSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package ru.pixnews.wasm.sqlite.driver.chasm

import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.binary.reader.AppleNsBundleSourceReader
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
Expand All @@ -17,7 +17,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmRuntime
import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmSqliteEmbedder

object ChasmAppleSqliteDriverFactory : TestSqliteDriverFactory<WasmSQLiteDriver<ChasmRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348
override fun create(
dbLogger: Logger,
sqlite3Binary: WasmSqliteConfiguration,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/jvmTest/kotlin/chasm/ChasmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package ru.pixnews.wasm.sqlite.driver.chasm

import at.released.weh.common.api.Logger
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -16,7 +16,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmRuntime
import ru.pixnews.wasm.sqlite.open.helper.chasm.ChasmSqliteEmbedder

object ChasmSqliteDriverFactory : TestSqliteDriverFactory<WasmSQLiteDriver<ChasmRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348
override fun create(
dbLogger: Logger,
sqlite3Binary: WasmSqliteConfiguration,
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/jvmTest/kotlin/chicory/ChicorySqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ru.pixnews.wasm.sqlite.driver.chicory

import at.released.weh.common.api.Logger
import com.dylibso.chicory.experimental.aot.AotMachine
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -19,7 +19,7 @@ import ru.pixnews.wasm.sqlite.open.helper.chicory.ChicorySqliteEmbedder
class ChicorySqliteDriverFactory(
private val useAot: Boolean = false,
) : TestSqliteDriverFactory<WasmSQLiteDriver<ChicoryRuntime>> {
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu346
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcu348

override fun create(
dbLogger: Logger,
Expand Down
8 changes: 4 additions & 4 deletions sqlite-driver/src/jvmTest/kotlin/graalvm/GraalvmBaseSqliteDriverPlainTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import org.junit.Rule
import org.junit.experimental.runners.Enclosed
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import ru.pixnews.wasm.sqlite.binary.SqliteWasmEmscripten346
import ru.pixnews.wasm.sqlite.binary.SqliteWasmEmscriptenMtPthread346
import ru.pixnews.wasm.sqlite.binary.SqliteWasmEmscripten348
import ru.pixnews.wasm.sqlite.binary.SqliteWasmEmscriptenMtPthread348
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.test.base.tests.AbstractBasicSqliteDriverTest

Expand All @@ -22,7 +22,7 @@ import ru.pixnews.wasm.sqlite.driver.test.base.tests.AbstractBasicSqliteDriverTe
class GraalvmBaseSqliteDriverPlainTest {
class MultiThreadedSqlitePlainTest : AbstractBasicSqliteDriverTest<WasmSQLiteDriver<*>>(
driverCreator = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteWasmEmscriptenMtPthread346,
defaultSqliteBinary = SqliteWasmEmscriptenMtPthread348,
additionalConfig = {
openParams {
openFlags = setOf()
Expand All @@ -39,7 +39,7 @@ class GraalvmBaseSqliteDriverPlainTest {

class SingleThreadedSqlitePlainTest : AbstractBasicSqliteDriverTest<WasmSQLiteDriver<*>>(
driverCreator = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteWasmEmscripten346,
defaultSqliteBinary = SqliteWasmEmscripten348,
additionalConfig = {
openParams {
openFlags = setOf()
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/jvmTest/kotlin/graalvm/GraalvmBaseSqliteDriverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.junit.Rule
import org.junit.experimental.runners.Enclosed
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.test.base.tests.AbstractBasicSqliteDriverTest

Expand All @@ -28,7 +28,7 @@ class GraalvmBaseSqliteDriverTest {

class SingleThreadedSqliteTest : AbstractBasicSqliteDriverTest<WasmSQLiteDriver<*>>(
driverCreator = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu346,
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu348,
),
) {
@JvmField
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/jvmTest/kotlin/graalvm/GraalvmBasicRoomTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import org.junit.Rule
import org.junit.experimental.runners.Enclosed
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcu348
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.JvmDatabaseFactory
import ru.pixnews.wasm.sqlite.driver.test.base.tests.room.AbstractBasicRoomTest
Expand All @@ -34,7 +34,7 @@ class GraalvmBasicRoomTest {

class SingleThreadedSqliteTest : AbstractBasicRoomTest<WasmSQLiteDriver<*>>(
driverFactory = GraalvmSqliteDriverFactory(
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu346,
defaultSqliteBinary = SqliteAndroidWasmEmscriptenIcu348,
),
databaseFactory = JvmDatabaseFactory,
) {
Expand Down
4 changes: 2 additions & 2 deletions sqlite-driver/src/jvmTest/kotlin/graalvm/GraalvmSqliteDriverFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ru.pixnews.wasm.sqlite.driver.graalvm

import at.released.weh.common.api.Logger
import org.graalvm.polyglot.Engine
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread346
import ru.pixnews.wasm.sqlite.binary.SqliteAndroidWasmEmscriptenIcuMtPthread348
import ru.pixnews.wasm.sqlite.binary.base.WasmSqliteConfiguration
import ru.pixnews.wasm.sqlite.driver.WasmSQLiteDriver
import ru.pixnews.wasm.sqlite.driver.base.defaultTestSqliteDriverConfig
Expand All @@ -20,7 +20,7 @@ import ru.pixnews.wasm.sqlite.open.helper.graalvm.GraalvmSqliteEmbedderConfig

class GraalvmSqliteDriverFactory(
private val initialGraalvmEngine: Engine? = WASM_GRAALVM_ENGINE,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread346,
override val defaultSqliteBinary: WasmSqliteConfiguration = SqliteAndroidWasmEmscriptenIcuMtPthread348,
private val additionalConfig: WasmSqliteDriverConfigBlock<GraalvmSqliteEmbedderConfig>.() -> Unit = {},
) : TestSqliteDriverFactory<WasmSQLiteDriver<GraalvmRuntime>> {
override fun create(
Expand Down
Loading
Loading