Skip to content

Commit

Permalink
chore(deps): Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
phinner committed Oct 29, 2024
1 parent 7a8f465 commit 335cf64
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 53 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@ 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:
java-version: 17
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Build Artifact
run: ./gradlew release
Expand Down
24 changes: 0 additions & 24 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"))
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand Down
26 changes: 2 additions & 24 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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" }

Expand All @@ -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" }
2 changes: 1 addition & 1 deletion src/main/java/com/xpdustry/sql4md/SQL4MDPlugin.java
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down

0 comments on commit 335cf64

Please sign in to comment.