Skip to content

Commit 3e61f91

Browse files
committed
chore: update dependencies and refactor imports for consistency
1 parent a8a5fa1 commit 3e61f91

8 files changed

Lines changed: 20 additions & 91 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import dev.slne.surf.surfapi.gradle.util.slneReleases
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.shadowJar
2+
import dev.slne.surf.api.gradle.util.slneReleases
23

34
plugins {
4-
id("dev.slne.surf.surfapi.gradle.core") version "1.21.11+"
5-
// id("dev.slne.surf.surfapi.gradle.standalone") version "1.21.11+" /* Uncomment to use tests */
5+
id("dev.slne.surf.api.gradle.core") version "26.1+"
66
}
77

88
surfCoreApi {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kotlin.stdlib.default.dependency=false
33
org.gradle.parallel=true
44
#org.gradle.caching=true
55
#org.gradle.configureondemand=true
6-
version=1.3.0
6+
version=1.3.0-SNAPSHOT

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
exposed = "1.0.0"
2+
exposed = "1.2.0"
33
r2dbc-mariadb = "1.3.0"
44
r2dbc-pool = "1.0.2.RELEASE"
55

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.slne.surf.database
22

3+
import dev.slne.surf.api.core.util.getCallerClass
34
import dev.slne.surf.database.config.DatabaseConfig
45
import dev.slne.surf.database.logger.ComponentSqlLogger
5-
import dev.slne.surf.surfapi.core.api.util.getCallerClass
66
import io.r2dbc.pool.ConnectionPool
77
import io.r2dbc.pool.ConnectionPoolConfiguration
88
import io.r2dbc.spi.ConnectionFactory
@@ -51,7 +51,14 @@ class DatabaseApi internal constructor(val database: R2dbcDatabase) {
5151
.username(config.credentials.username)
5252
.password(config.credentials.password)
5353
.database(config.credentials.database)
54-
.loopResources(LoopResources.create("mariadb-r2dbc-event-loop-$poolName", 1, 4, true))
54+
.loopResources(
55+
LoopResources.create(
56+
"mariadb-r2dbc-event-loop-$poolName",
57+
1,
58+
4,
59+
true
60+
)
61+
)
5562
.build()
5663

5764
val connectionFactory = MariadbConnectionFactory.from(configuration)

src/main/kotlin/dev/slne/surf/database/config/DatabaseConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.slne.surf.database.config
22

3-
import dev.slne.surf.surfapi.core.api.config.createSpongeYmlConfig
4-
import dev.slne.surf.surfapi.core.api.config.surfConfigApi
3+
import dev.slne.surf.api.core.config.createSpongeYmlConfig
4+
import dev.slne.surf.api.core.config.surfConfigApi
55
import org.slf4j.event.Level
66
import org.spongepowered.configurate.objectmapping.ConfigSerializable
77
import java.nio.file.Path

src/main/kotlin/dev/slne/surf/database/logger/ComponentSqlLogger.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.slne.surf.database.logger
22

3-
import dev.slne.surf.surfapi.core.api.util.getCallerClass
3+
import dev.slne.surf.api.core.util.getCallerClass
44
import net.kyori.adventure.text.logger.slf4j.ComponentLogger
55
import org.jetbrains.exposed.v1.core.SqlLogger
66
import org.jetbrains.exposed.v1.core.Transaction
@@ -9,7 +9,9 @@ import org.jetbrains.exposed.v1.core.statements.expandArgs
99
import org.slf4j.event.Level
1010

1111
class ComponentSqlLogger(
12-
private val logger: ComponentLogger = ComponentLogger.logger(getCallerClass() ?: ComponentSqlLogger::class.java),
12+
private val logger: ComponentLogger = ComponentLogger.logger(
13+
getCallerClass() ?: ComponentSqlLogger::class.java
14+
),
1315
private val level: Level
1416
) : SqlLogger {
1517

src/test/kotlin/dev/slne/surf/database/DatabaseContainerSmokeTest.kt

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/test/kotlin/dev/slne/surf/database/DatabaseTestBase.kt

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)