From c1f9941f26f61039fcb68c992fcebfd77f1f698d Mon Sep 17 00:00:00 2001
From: Josh Taylor <me@broccol.ai>
Date: Mon, 16 Oct 2023 22:47:36 +0100
Subject: [PATCH] chore:build changes

---
 api/build.gradle.kts                          |  3 +-
 .../api/model/tag/TagDisplayInformation.java  | 31 ++++++-------------
 buildSrc/build.gradle.kts                     |  2 +-
 buildSrc/src/main/kotlin/Configurations.kt    |  3 +-
 bukkit/build.gradle.kts                       |  4 ++-
 gradle/libs.versions.conf                     |  2 +-
 settings.gradle.kts                           |  3 +-
 7 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index a4d49c8..1ca85aa 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -2,4 +2,5 @@ dependencies {
     api(libs.guice.core)
     api(libs.minimessage)
     api(libs.event.api)
-}
\ No newline at end of file
+    api(libs.configurate)
+}
diff --git a/api/src/main/java/broccolai/tags/api/model/tag/TagDisplayInformation.java b/api/src/main/java/broccolai/tags/api/model/tag/TagDisplayInformation.java
index be554f6..f0cf028 100644
--- a/api/src/main/java/broccolai/tags/api/model/tag/TagDisplayInformation.java
+++ b/api/src/main/java/broccolai/tags/api/model/tag/TagDisplayInformation.java
@@ -1,25 +1,14 @@
 package broccolai.tags.api.model.tag;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
-
-public final class TagDisplayInformation {
-    private final @NonNull String material;
-    private final int customModelData;
-
-    public TagDisplayInformation(
-            @NonNull String material,
-            int customModelData
-    ) {
-        this.material = material;
-        this.customModelData = customModelData;
-    }
-
-    public @NonNull String material() {
-        return this.material;
-    }
-
-    public int customModelData() {
-        return this.customModelData;
-    }
-
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
+
+//todo(josh): split tag into an interface and hide this in the implementation
+//            and remove configurate as a dependency in for api project
+@ConfigSerializable
+public record TagDisplayInformation(
+        @NonNull String material,
+        @Nullable Integer customModelData
+) {
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index bed38d2..742f2f1 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,5 +8,5 @@ repositories {
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins", "shadow", "7.0.0")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
 }
diff --git a/buildSrc/src/main/kotlin/Configurations.kt b/buildSrc/src/main/kotlin/Configurations.kt
index d99fbb7..2355af5 100644
--- a/buildSrc/src/main/kotlin/Configurations.kt
+++ b/buildSrc/src/main/kotlin/Configurations.kt
@@ -37,7 +37,6 @@ fun Project.setupShadowJar() {
             )
 
             archiveFileName.set(project.name + ".jar")
-            minimize()
         }
 
         getByName("build") {
@@ -52,4 +51,4 @@ private fun ShadowJar.relocate(group: Any, vararg dependencies: String) {
         val name = split.last()
         relocate(it, "$group.dependencies.$name")
     }
-}
\ No newline at end of file
+}
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
index 97ced37..51ec82b 100644
--- a/bukkit/build.gradle.kts
+++ b/bukkit/build.gradle.kts
@@ -13,10 +13,12 @@ dependencies {
 
     api(libs.cloud.paper)
     api(libs.cloud.extras)
+
+    implementation(libs.h2)
 }
 
 tasks {
     runServer {
         minecraftVersion("1.20")
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.conf b/gradle/libs.versions.conf
index b33f8d0..b40f664 100644
--- a/gradle/libs.versions.conf
+++ b/gradle/libs.versions.conf
@@ -44,7 +44,7 @@ versions = {
   jdbi = "3.41.3"
   hikari = "5.0.1"
   flyway = "9.22.3"
-  h2 = "2.1.212"
+  h2 = "2.2.224"
   configurate = "4.1.2"
 
   # Misc
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2187230..c7610a3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 rootProject.name = "tags"
 
-
 use("api", "core", "bukkit")
 
 fun use(vararg names: String) {
@@ -12,4 +11,4 @@ fun use(vararg names: String) {
         include(name)
         project(":$name").name = "${rootProject.name}-$name"
     }
-}
\ No newline at end of file
+}