Skip to content

Commit

Permalink
Merge branch 'master' into xpdustry-master
Browse files Browse the repository at this point in the history
  • Loading branch information
phinner committed Dec 10, 2023
2 parents 856ce5f + 46ad2b8 commit 11c5543
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

plugins {
id("com.diffplug.spotless") version "6.22.0"
id("com.diffplug.spotless") version "6.23.3"
id("net.kyori.indra") version "3.1.3"
id("net.kyori.indra.publishing") version "3.1.3"
id("net.kyori.indra.git") version "3.1.3"
id("net.kyori.indra.licenser.spotless") version "3.1.3"
id("net.ltgt.errorprone") version "3.1.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("fr.xpdustry.toxopid") version "3.2.0"
id("com.github.ben-manes.versions") version "0.49.0"
id("com.github.ben-manes.versions") version "0.50.0"
}

val metadata =
Expand All @@ -23,7 +23,7 @@ val metadata =
displayName = "TemplatePlugin",
author = "Xpdustry",
description = "A template plugin for Mindustry to get you started quickly.",
version = "3.5.0",
version = "3.5.1",
minGameVersion = "146",
hidden = true,
java = true,
Expand Down Expand Up @@ -57,19 +57,19 @@ repositories {

dependencies {
mindustryDependencies()
compileOnly("fr.xpdustry:distributor-api:3.2.0")
compileOnly("fr.xpdustry:distributor-api:3.2.1")

val junit = "5.10.1"
testImplementation("org.junit.jupiter:junit-jupiter-params:$junit")
testImplementation("org.junit.jupiter:junit-jupiter-api:$junit")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit")

val checker = "3.40.0"
val checker = "3.41.0"
compileOnly("org.checkerframework:checker-qual:$checker")
testImplementation("org.checkerframework:checker-qual:$checker")

// Static analysis
annotationProcessor("com.uber.nullaway:nullaway:0.10.16")
annotationProcessor("com.uber.nullaway:nullaway:0.10.18")
errorprone("com.google.errorprone:error_prone_core:2.23.0")
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 11c5543

Please sign in to comment.