diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..2a84e188 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/libs.versions.toml b/libs.versions.toml index 52077240..ce70bbdd 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,24 +1,24 @@ [versions] -minecraft = "1.21.6" -yarn-mappings = "1.21.6+build.1" -fabric-loader = "0.16.14" +minecraft = "1.21.8" +yarn-mappings = "1.21.8+build.1" +fabric-loader = "0.17.1" -fabric-api = "0.127.1+1.21.6" +fabric-api = "0.131.0+1.21.8" # Kotlin -kotlin = "2.1.21" +kotlin = "2.2.0" # Also modrinth version in gradle.properties -fabric-kotlin = "1.13.3+kotlin.2.1.21" +fabric-kotlin = "1.13.4+kotlin.2.2.0" -fabric-permissions = "0.4.0" +fabric-permissions = "0.4.1" translations = "2.5.1+1.21.5" -exposed = "0.58.0" -sqlite-jdbc = "3.47.2.0" +exposed = "0.61.0" +sqlite-jdbc = "3.50.3.0" konf = "1.1.2" -detekt = "1.23.7" +detekt = "1.23.8" [libraries] minecraft = { module = "net.minecraft:minecraft", version.ref = "minecraft" } @@ -45,5 +45,5 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", [plugins] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } -loom = { id = "fabric-loom", version = "1.10.+" } +loom = { id = "fabric-loom", version = "1.11.+" } git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" } diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt b/src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt index 583284a9..2245d9cb 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt @@ -1,6 +1,5 @@ package com.github.quiltservertools.ledger.database -import MigrationUtils import com.github.quiltservertools.ledger.Ledger import com.github.quiltservertools.ledger.actions.ActionType import com.github.quiltservertools.ledger.actionutils.ActionSearchParams @@ -34,6 +33,7 @@ import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.sql.Query +import org.jetbrains.exposed.sql.SchemaUtils import org.jetbrains.exposed.sql.SortOrder import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.SqlExpressionBuilder.inSubQuery @@ -108,15 +108,14 @@ object DatabaseManager { fun ensureTables() = transaction { addLogger(ledgerLogger) - MigrationUtils.statementsRequiredForDatabaseMigration( + SchemaUtils.create( Tables.Players, Tables.Actions, Tables.ActionIdentifiers, Tables.ObjectIdentifiers, Tables.Sources, Tables.Worlds, - withLogs = true - ).forEach(::exec) + ) logInfo("Tables created") }