Skip to content

Commit 9be342e

Browse files
committed
Update project dependencies and configurations
- Downgrade JVM toolchain to 21 - Bump project version to 3.0.0-SNAPSHOT - Upgrade `Exposed` to v1.0.0-rc-1 and related imports - Update other dependencies: HikariCP, MariaDB, Lettuce - Adjust build and IDE settings for JVM 21 compatibility
1 parent 6f09131 commit 9be342e

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
}
2323

2424
kotlin {
25-
jvmToolchain(24)
25+
jvmToolchain(21)
2626
}
2727

2828
publishing {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
kotlin.stdlib.default.dependency=false
33
org.gradle.parallel=true
4-
version=2.2.1-SNAPSHOT
4+
version=3.0.0-SNAPSHOT

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
2-
exposed = "0.61.0"
3-
hikari = "6.3.0"
2+
exposed = "1.0.0-rc-1"
3+
hikari = "7.0.2"
44
sqlite = "3.50.3.0"
5-
mariadb = "3.5.4"
6-
lettuce = "6.7.1.RELEASE"
5+
mariadb = "3.5.5"
6+
lettuce = "6.8.1.RELEASE"
77

88
[libraries]
99
exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.zaxxer.hikari.HikariDataSource
55
import dev.slne.surf.database.config.ConnectionConfig
66
import dev.slne.surf.database.config.database.DatabaseHikariConfig
77
import dev.slne.surf.surfapi.core.api.util.logger
8-
import org.jetbrains.exposed.sql.Database
8+
import org.jetbrains.exposed.v1.jdbc.Database
99
import java.nio.file.Path
1010
import kotlin.io.path.absolutePathString
1111
import kotlin.io.path.createFile

src/main/kotlin/dev/slne/surf/database/database/columns/ZonedDateTimeColumnType.kt

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

33

4-
import org.jetbrains.exposed.sql.*
5-
import org.jetbrains.exposed.sql.Function
6-
import org.jetbrains.exposed.sql.vendors.*
7-
import java.sql.ResultSet
4+
import org.jetbrains.exposed.v1.core.*
5+
import org.jetbrains.exposed.v1.core.Function
6+
import org.jetbrains.exposed.v1.core.statements.api.RowApi
7+
import org.jetbrains.exposed.v1.core.vendors.*
88
import java.sql.Timestamp
99
import java.time.*
1010
import java.time.format.DateTimeFormatter
@@ -102,7 +102,7 @@ class ZonedDateTimeColumnType : ColumnType<ZonedDateTime>(), IDateColumnType {
102102
}
103103
}
104104

105-
override fun readObject(rs: ResultSet, index: Int): Any? {
105+
override fun readObject(rs: RowApi, index: Int): Any? {
106106
return if (currentDialect is OracleDialect) {
107107
rs.getObject(index, Timestamp::class.java)
108108
} else {

0 commit comments

Comments
 (0)