From 335cf64ab35ca4e998cb30fd8bf07fe727365835 Mon Sep 17 00:00:00 2001
From: phinner <62483793+phinner@users.noreply.github.com>
Date: Tue, 29 Oct 2024 19:37:43 +0100
Subject: [PATCH] chore(deps): Update dependencies

---
 .github/workflows/build.yml                   |  5 +---
 build.gradle.kts                              | 24 -----------------
 gradle/libs.versions.toml                     | 26 ++-----------------
 .../com/xpdustry/sql4md/SQL4MDPlugin.java     |  2 +-
 4 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29d41a8..6bd4d88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -33,7 +30,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Artifact
         run: ./gradlew release
diff --git a/build.gradle.kts b/build.gradle.kts
index 2675785..db50f7f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,8 +2,6 @@ import com.xpdustry.toxopid.extension.anukeXpdustry
 import com.xpdustry.toxopid.spec.ModMetadata
 import com.xpdustry.toxopid.spec.ModPlatform
 import com.xpdustry.toxopid.task.GithubAssetDownload
-import net.ltgt.gradle.errorprone.CheckSeverity
-import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
     alias(libs.plugins.spotless)
@@ -12,7 +10,6 @@ plugins {
     alias(libs.plugins.indra.publishing)
     alias(libs.plugins.shadow)
     alias(libs.plugins.toxopid)
-    alias(libs.plugins.errorprone.gradle)
 }
 
 val metadata = ModMetadata.fromJson(rootProject.file("plugin.json"))
@@ -45,15 +42,6 @@ dependencies {
     // Up-to-date version of protobuf for mysql
     runtimeOnly(libs.protobuf)
     implementation(libs.mariadb)
-
-    // testImplementation(libs.junit.api)
-    // testRuntimeOnly(libs.junit.engine)
-
-    // compileOnly(libs.checker.qual)
-    // testCompileOnly(libs.checker.qual)
-
-    annotationProcessor(libs.nullaway)
-    errorprone(libs.errorprone.core)
 }
 
 configurations.runtimeClasspath {
@@ -141,18 +129,6 @@ tasks.register<Copy>("release") {
     destinationDir = temporaryDir
 }
 
-tasks.withType<JavaCompile> {
-    options.errorprone {
-        disableWarningsInGeneratedCode = true
-        disable("MissingSummary", "InlineMeSuggester")
-        if (!name.contains("test", ignoreCase = true)) {
-            check("NullAway", CheckSeverity.ERROR)
-            option("NullAway:AnnotatedPackages", rootPackage)
-            option("NullAway:TreatGeneratedAsUnannotated", true)
-        }
-    }
-}
-
 val downloadSlf4md by tasks.registering(GithubAssetDownload::class) {
     owner = "xpdustry"
     repo = "slf4md"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0045f33..f9c518a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +1,17 @@
 [versions]
 # plugins
-shadow = "8.3.3"
+shadow = "8.3.4"
 indra = "3.1.3"
 toxopid = "4.1.0"
 spotless = "6.25.0"
-errorprone-gradle = "4.0.1"
 
 # utilities
 slf4md = "1.0.1"
 
 # sql libraries
 sqlite = "3.47.0.0"
-mariadb = "3.4.1"
+mariadb = "3.5.0"
 mysql = "9.1.0"
-
-# testing
-junit = "5.11.3"
-
-# static analysis
-errorprone-core = "2.28.0"
-nullaway = "0.11.0"
-checker-qual = "3.44.0"
-
 # overrides
 protobuf = "4.28.3"
 
@@ -30,17 +20,6 @@ protobuf = "4.28.3"
 sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
 mariadb = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "mariadb" }
 mysql = { module = "com.mysql:mysql-connector-j", version.ref = "mysql" }
-hikari = { module = "com.zaxxer:HikariCP", version = "4.0.3" }
-
-# testing
-junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
-
-# static analysis
-nullaway = { module = "com.uber.nullaway:nullaway", version.ref = "nullaway" }
-errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone-core" }
-checker-qual = { module = "org.checkerframework:checker-qual", version.ref = "checker-qual" }
-
 # overrides
 protobuf = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
 
@@ -51,4 +30,3 @@ indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 toxopid = { id = "com.xpdustry.toxopid", version.ref = "toxopid" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-errorprone-gradle = { id = "net.ltgt.errorprone", version.ref = "errorprone-gradle" }
diff --git a/src/main/java/com/xpdustry/sql4md/SQL4MDPlugin.java b/src/main/java/com/xpdustry/sql4md/SQL4MDPlugin.java
index 25c5891..e565aee 100644
--- a/src/main/java/com/xpdustry/sql4md/SQL4MDPlugin.java
+++ b/src/main/java/com/xpdustry/sql4md/SQL4MDPlugin.java
@@ -1,5 +1,5 @@
 /*
- * This file is part of TemplatePlugin. A template plugin for Mindustry to get you started quickly.
+ * This file is part of SQL4MD. A plugin providing several SQL drivers for other plugins.
  *
  * MIT License
  *