diff --git a/build.gradle.kts b/build.gradle.kts index b423474..89af386 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import com.diffplug.gradle.spotless.SpotlessExtension import com.diffplug.gradle.spotless.SpotlessPlugin +import com.diffplug.spotless.FormatterFunc import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar @@ -13,6 +14,7 @@ import net.kyori.indra.IndraPlugin import net.ltgt.gradle.errorprone.CheckSeverity import net.ltgt.gradle.errorprone.ErrorPronePlugin import net.ltgt.gradle.errorprone.errorprone +import org.gradle.internal.impldep.kotlinx.serialization.Serializable plugins { alias(libs.plugins.spotless) apply false @@ -45,7 +47,11 @@ allprojects { java { palantirJavaFormat() importOrder("", "\\#") - custom("no-wildcard-imports") { it.apply { if (contains("*;\n")) error("No wildcard imports allowed") } } + // I will kill someone + custom("no-wildcard-imports", object : FormatterFunc, java.io.Serializable { + override fun apply(input: String) = + input.apply { if (contains("*;\n")) error("No wildcard imports allowed") } + }) licenseHeaderFile(rootProject.file("HEADER.txt")) bumpThisNumberIfACustomStepChanges(1) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 297f9e2..d521db7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ shadow = "8.3.5" indra = "3.1.3" toxopid = "4.1.1" -spotless = "6.25.0" +spotless = "7.0.1" errorprone-gradle = "4.1.0" # logging @@ -11,8 +11,8 @@ slf4j = "2.0.16" # static analysis errorprone-core = "2.36.0" -nullaway = "0.12.1" -checker-qual = "3.48.3" +nullaway = "0.12.3" +checker-qual = "3.48.4" [libraries] # logging diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum