Skip to content

Commit 3201a07

Browse files
committed
Switch to JitPack Exposed fork to include R2DBC fixes and update dependency exclusions
1 parent 4ee6de3 commit 3201a07

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ group = "dev.slne.surf"
99
version = findProperty("version") as String
1010

1111
dependencies {
12-
implementation(libs.bundles.exposed) {
13-
exclude("org.jetbrains.kotlin")
14-
exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
15-
exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-reactive")
16-
exclude("org.jetbrains.kotlinx", "kotlinx-serialization-json")
17-
}
12+
// implementation(libs.bundles.exposed)
13+
/* Use JitPack until https://github.com/JetBrains/Exposed/commit/f425884a4e0799a55b87f54b19bf7f84b291d0b9 is included in the next release */
14+
implementation("com.github.JetBrains.Exposed:exposed-core:f425884")
15+
implementation("com.github.JetBrains.Exposed:exposed-r2dbc:f425884")
16+
implementation("com.github.JetBrains.Exposed:exposed-java-time:f425884")
17+
implementation("com.github.JetBrains.Exposed:exposed-json:f425884")
18+
1819
implementation(libs.r2dbc.pool)
1920
implementation(libs.bundles.databaseDriver)
2021
}
@@ -23,6 +24,10 @@ configurations.runtimeClasspath {
2324
exclude("io.projectreactor", "reactor-core")
2425
exclude("org.reactivestreams")
2526
exclude("org.slf4j")
27+
exclude("org.jetbrains.kotlin")
28+
exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
29+
exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-reactive")
30+
exclude("org.jetbrains.kotlinx", "kotlinx-serialization-json")
2631
}
2732

2833
shadow {

src/main/kotlin/dev/slne/surf/database/DatabaseApi.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.jetbrains.exposed.v1.core.vendors.MariaDBDialect
1515
import org.jetbrains.exposed.v1.r2dbc.R2dbcDatabase
1616
import org.jetbrains.exposed.v1.r2dbc.R2dbcDatabaseConfig
1717
import org.jetbrains.exposed.v1.r2dbc.mappers.R2dbcRegistryTypeMapping
18+
import org.jetbrains.exposed.v1.r2dbc.statements.api.R2dbcExposedConnection
1819
import org.jetbrains.exposed.v1.r2dbc.transactions.TransactionManager
1920
import org.jetbrains.exposed.v1.r2dbc.transactions.suspendTransaction
2021
import org.mariadb.r2dbc.MariadbConnectionConfiguration

0 commit comments

Comments
 (0)