build(gradle): Use Minix-Conventions

Author: Racci

build.gradle.kts

@@ -1,15 +1,10 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     application
-
-    kotlin("jvm")
+    id("dev.racci.minix.kotlin")
     kotlin("plugin.serialization")
-
     id("com.github.johnrengelman.shadow")
 }
 
-group = "dev.racci.elixir"
 version = "1.0"
 
 repositories {
@@ -23,33 +18,27 @@ repositories {
 
 dependencies {
 
-    implementation(libs.kord.extensions)
-    implementation(libs.kord.phishing)
-    implementation(libs.kotlin.stdlib)
+    implementation(eLib.kord.extensions)
+    implementation(eLib.kord.phishing)
+//    implementation(libs.kotlin.stdlib)
 
     // Logging dependencies
-    implementation(libs.groovy)
-    implementation(libs.logback)
-    implementation(libs.logging)
+    implementation(eLib.groovy)
+    implementation(eLib.logback)
+    implementation(eLib.logging)
 
     // Tags
-    implementation(libs.kotlinx.serialization)
-    implementation(libs.kaml)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.serialization.kaml)
 
-    // TOML reader
     @Suppress("GradlePackageUpdate")
     implementation("com.github.jezza:toml:1.2")
 
     // Github API
     implementation("org.kohsuke:github-api:1.301")
 
     // Exposed
-    implementation("org.jetbrains.exposed:exposed-core:0.37.3")
-    implementation("org.jetbrains.exposed:exposed-dao:0.37.3")
-    implementation("org.jetbrains.exposed:exposed-jdbc:0.37.3")
-
-    // Hikari
-    implementation("com.zaxxer:HikariCP:5.0.1")
+    implementation(libs.bundles.exposed)
 
     // SQLite
     implementation("org.xerial:sqlite-jdbc:3.36.0.3")
@@ -60,9 +49,7 @@ application {
     mainClassName = "dev.racci.elixir.ElixirBotKt"
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
-
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 
@@ -73,13 +60,3 @@ tasks.jar {
         )
     }
 }
-
-// This is to fix an issue with pushing that I cannot seem to fix.
-tasks.create<Delete>("detekt") {
-
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle.properties

@@ -1,4 +1,12 @@
 # suppress inspection "UnusedProperty" for whole file
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=1536M
+group=dev.racci
+version=1.0
+addRunNumber=false
+kotlinVersion=1.6.10
+minixVersion=0.4.47
+minixConventions=1.6.10-47
+copyJar=false
+org.gradle.caching=true
+org.gradle.console=rich
 org.gradle.parallel=true
 kotlin.incremental=true

libs.versions.toml

@@ -1,20 +1,13 @@
 [versions]
-kotlin = "1.6.10"  # Note: Plugin versions must be updated in the settings.gradle.kts too
 
 groovy = "3.0.9"
 kord-extensions = "1.5.1-SNAPSHOT"
 logging = "2.1.21"
 logback = "1.2.8"
 
-kotlinx-serialization = "1.3.2"
-kaml = "0.39.0"
-
 [libraries]
 groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
 kord-extensions = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" }
 kord-phishing = { module = "com.kotlindiscord.kord.extensions:extra-phishing", version.ref = "kord-extensions" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "logging" }
-kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
-kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kaml" }
+logging = { module = "io.github.microutils:kotlin-logging", version.ref = "logging" }

settings.gradle.kts

@@ -1,22 +1,41 @@
+enableFeaturePreview("VERSION_CATALOGS")
 pluginManagement {
-    plugins {
-        // Update this in libs.version.toml when you change it here
-        kotlin("jvm") version "1.6.10"
-        kotlin("plugin.serialization") version "1.6.10"
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven("https://repo.racci.dev/releases")
+        maven("https://papermc.io/repo/repository/maven-public/")
+    }
 
-        // Update this in libs.version.toml when you change it here
+    plugins {
+        val kotlinVersion: String by settings
+        kotlin("plugin.serialization") version kotlinVersion
         id("com.github.johnrengelman.shadow") version "7.1.2"
     }
+    val minixConventions: String by settings
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id.startsWith("dev.racci.minix")) {
+                useVersion(minixConventions)
+            }
+        }
+    }
 }
 
 rootProject.name = "ElixirBot"
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
+    repositories {
+        maven("https://repo.racci.dev/releases")
+    }
+
     versionCatalogs {
         create("libs") {
+            val minixConventions: String by settings
+            from("dev.racci:catalog:$minixConventions")
+        }
+        create("eLib") {
             from(files("libs.versions.toml"))
         }
     }
-}
+}

src/main/kotlin/dev/racci/elixir/ElixirBot.kt

@@ -33,9 +33,6 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import kotlin.properties.Delegates
-import mu.KotlinLogging
-import org.kohsuke.github.GitHub
-import org.kohsuke.github.GitHubBuilder
 
 val configPath: Path = Paths.get(CONFIG_PATH)
 val config: TomlTable = Toml.from(Files.newInputStream(Paths.get("$configPath/config.toml")))