Add dedicated MariaDB support

Add maxLifetime config option

Author: PotatoPresident

build.gradle

@@ -1,17 +1,26 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
-	id 'fabric-loom' version '1.6.+'
+	id 'fabric-loom' version '1.12.7'
 	id 'maven-publish'
-	id 'org.jetbrains.kotlin.jvm' version "1.8.22"
+	id 'org.jetbrains.kotlin.jvm' version "2.2.21"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
-archivesBaseName = project.archives_base_name
+base {
+    archivesName = project.archives_base_name
+}
 version = project.mod_version
 group = project.maven_group
 
 repositories {
+    mavenCentral()
 	mavenLocal()
 	maven {
 		url = "https://maven.nucleoid.xyz"
@@ -45,6 +54,8 @@ dependencies {
 
 	// PostgreSQL
 	implementation(include("org.postgresql:postgresql:42.7.3"))
+
+    modImplementation("me.lucko:fabric-permissions-api:0.3")
 }
 
 processResources {
@@ -61,6 +72,12 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.release = 17
 }
 
+tasks.withType(KotlinCompile).configureEach {
+    it.compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_8
+    it.compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_8
+    it.compilerOptions.jvmTarget = JvmTarget.JVM_17
+}
+
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
@@ -70,7 +87,7 @@ java {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}"}
 	}
 }
 

gradle.properties

@@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx2G
 	loader_version=0.14.8
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version = 1.2.1
 	maven_group = net.quiltservertools
 	archives_base_name = ledger-databases

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 package net.quiltservertools.ledger.databases
 
 import com.uchuhimo.konf.ConfigSpec
+import java.util.concurrent.TimeUnit.MINUTES
 
 object DatabaseExtensionSpec : ConfigSpec("database_extensions") {
     val database by required<Databases>("database")
@@ -10,4 +11,5 @@ object DatabaseExtensionSpec : ConfigSpec("database_extensions") {
     val properties by optional(mapOf<String, String>(), "properties")
     val maxPoolSize by optional(10, "maxPoolSize")
     val connectionTimeout by optional(60000L, "connectionTimeout")
+    val maxLifetime by optional(MINUTES.toMillis(30), "maxLifetime")
 }

gradlew

@@ -15,6 +15,7 @@ object MariaDB : LedgerDatabase {
         password = Ledger.config[DatabaseExtensionSpec.password]
         maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize]
         connectionTimeout = Ledger.config[DatabaseExtensionSpec.connectionTimeout]
+        maxLifetime = Ledger.config[DatabaseExtensionSpec.maxLifetime]
         addDataSourceProperty("rewriteBatchedStatements", "true")
         addDataSourceProperty("cachePrepStmts", true)
         addDataSourceProperty("prepStmtCacheSize", 250)

gradlew.bat

@@ -15,6 +15,7 @@ object MySQL : LedgerDatabase {
         password = Ledger.config[DatabaseExtensionSpec.password]
         maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize]
         connectionTimeout = Ledger.config[DatabaseExtensionSpec.connectionTimeout]
+        maxLifetime = Ledger.config[DatabaseExtensionSpec.maxLifetime]
         addDataSourceProperty("rewriteBatchedStatements", "true")
         addDataSourceProperty("cachePrepStmts", true)
         addDataSourceProperty("prepStmtCacheSize", 250)

src/main/kotlin/net/quiltservertools/ledger/databases/DatabaseExtensionSpec.kt

@@ -14,6 +14,7 @@ object PostgreSQL : LedgerDatabase {
         username = Ledger.config[DatabaseExtensionSpec.userName]
         password = Ledger.config[DatabaseExtensionSpec.password]
         maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize]
+        maxLifetime = Ledger.config[DatabaseExtensionSpec.maxLifetime]
         addDataSourceProperty("reWriteBatchedInserts", "true")
         for ((key, value) in Ledger.config[DatabaseExtensionSpec.properties]) {
             addDataSourceProperty(key, value)