Update Gradle to v9.4

Author: lucko

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
   build-gradle:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest] # , windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1' apply false
+    id 'dev.yumi.gradle.licenser' version '2.2.2' apply false
     id 'com.gradleup.shadow' version '8.3.8' apply false
-    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
+    id 'net.fabricmc.fabric-loom-remap' version '1.15-SNAPSHOT' apply false
 }
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -16,7 +16,7 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'java-library'
-    apply plugin: 'org.cadixdev.licenser'
+    apply plugin: 'dev.yumi.gradle.licenser'
 
     ext {
         baseVersion = '1.10'
@@ -60,8 +60,7 @@ subprojects {
     }
 
     license {
-        header = rootProject.file('HEADER.txt')
-        include '**/*.java'
+        rule(rootProject.file("HEADER.txt"))
     }
 
     repositories {
@@ -82,12 +81,9 @@ subprojects {
 }
 
 def determinePatchVersion() {
-    def tagInfo = new ByteArrayOutputStream()
-    exec {
+    def tagInfo = providers.exec {
         commandLine 'git', 'describe', '--tags'
-        standardOutput = tagInfo
-    }
-    tagInfo = tagInfo.toString()
+    }.standardOutput.asText.get().trim()
 
-    return tagInfo.contains('-') ? tagInfo.split("-")[1] : 0
+    return tagInfo.contains('-') ? tagInfo.split('-')[1] : 0
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
@@ -17,7 +18,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'spark'

gradlew

@@ -5,12 +5,11 @@ plugins {
 version = '0.1-SNAPSHOT'
 
 dependencies {
-    compileOnly 'org.checkerframework:checker-qual:3.44.0'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jspecify:jspecify:1.0.0'
 }
 
 license {
-    header = project.file('HEADER.txt')
+    rule(project.file('HEADER.txt'))
 }
 
 java {

gradlew.bat

@@ -30,9 +30,8 @@
 import me.lucko.spark.api.statistic.misc.DoubleAverageInfo;
 import me.lucko.spark.api.statistic.types.DoubleStatistic;
 import me.lucko.spark.api.statistic.types.GenericStatistic;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 
@@ -82,7 +81,7 @@ public interface Spark {
      *
      * @return the garbage collector statistics
      */
-    @NonNull @Unmodifiable Map<String, GarbageCollector> gc();
+    @NonNull Map<String, GarbageCollector> gc();
 
     /**
      * Gets a placeholder resolver.

settings.gradle

@@ -25,7 +25,7 @@
 
 package me.lucko.spark.api;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Singleton provider for {@link Spark}.