upgrade to support java 25 and gradle 9.2.1

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [ 24 ]
+        version: [ 25 ]
         vector-length: [ 256, 512 ]
 
     steps:

.github/workflows/publish.yml

@@ -17,11 +17,11 @@ jobs:
 
       - uses: gradle/actions/wrapper-validation@v4
 
-      - name: Set up JDK 24
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 24
+          java-version: 25
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.gitignore

@@ -1,6 +1,59 @@
+build/
+target/
+!.mvn/wrapper/maven-wrapper.jar
+.DS_Store
+out/
+generated/
+generated_tests/
+generated-resources-dir/
+bin/
+*.swp
+
+# python
+__pycache__
+venv
+.pyc
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+*.log*
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.gradle/*
+
+### IntelliJ IDEA ###
 .idea
-.gradle
-build
-profilers
-testdata
-hotspot_*.log
+*.iws
+*.iml
+*.ipr
+#### Intellij run configuration
+.run/
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+*/.gradle/*

build.gradle

@@ -1,5 +1,4 @@
 import me.champeau.jmh.JmhBytecodeGeneratorTask
-import org.ajoberstar.grgit.Grgit
 import org.gradle.internal.os.OperatingSystem
 
 import java.time.Duration
@@ -8,17 +7,17 @@ plugins {
     id 'java'
     id 'scala'
     id 'me.champeau.jmh' version '0.7.1'
-    id 'org.ajoberstar.grgit' version '5.2.0'
-    id 'pl.allegro.tech.build.axion-release' version '1.15.5'
-    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.21.1'
+    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
     id 'maven-publish'
     id 'signing'
 }
 
 scmVersion {
     versionCreator('versionWithBranch')
     tag {
-        prefix = ''
+        // Property<String> in newer versions
+        prefix.set('')
     }
 }
 
@@ -29,17 +28,52 @@ repositories {
     mavenCentral()
 }
 
+// Dynamically resolve Java major version from:
+// 1) env BUILD_JAVA_VERSION (if set), else
+// 2) the JVM running Gradle (JavaVersion.current().majorVersion)
+//
+// Accepts values like: "24", "24.0.1", "24-ea", "24.0.2-tem", etc.
+static int resolveBuildJavaVersion() {
+    String v = System.getenv('BUILD_JAVA_VERSION') ?: JavaVersion.current().majorVersion
+
+    int dot = v.indexOf('.')
+    if (dot >= 0) {
+        v = v.substring(0, dot)
+    }
+
+    int dash = v.indexOf('-')
+    if (dash >= 0) {
+        v = v.substring(0, dash)
+    }
+
+    try {
+        return Integer.parseInt(v)
+    } catch (Exception e) {
+        throw new GradleException("Invalid BUILD_JAVA_VERSION '${System.getenv('BUILD_JAVA_VERSION')}'. " +
+                "Expected a Java major version like '24' (optionally with suffixes like '24.0.1' or '24-ea').", e)
+    }
+}
+
+// Usage
+def buildJavaVersion = resolveBuildJavaVersion()
+
+// recommended build java version is 25
+if (buildJavaVersion < 24) {
+    throw new GradleException(
+            "This build requires Java 24+.\n" +
+                    "Detected buildJavaVersion=${buildJavaVersion}.\n" +
+                    "Either run Gradle with JDK 24+ (JAVA_HOME / PATH), or set BUILD_JAVA_VERSION=24 (or higher)."
+    )
+}
+
 java {
-    // It seems that specifying the minimum supported Java version while allowing the use of newer
-    // ones isn't possible in Gradle. To test the library against multiple Java versions, the
-    // workaround proposed in https://github.com/gradle/gradle/issues/16256 has been applied:
-    if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_24)) {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(24)
-        }
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(buildJavaVersion)
     }
     withJavadocJar()
     withSourcesJar()
+    sourceCompatibility = JavaVersion.toVersion(buildJavaVersion)
+    targetCompatibility = JavaVersion.toVersion(buildJavaVersion)
 }
 
 ext {
@@ -62,22 +96,47 @@ dependencies {
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitVersion
 }
 
-tasks.register('downloadTestData') {
-    doFirst {
-        def testDataDir = new File("${project.projectDir.getAbsolutePath()}/testdata")
-        if (!testDataDir.exists()) {
-            testDataDir.mkdir()
-        }
-        def numbersTestDataDir = new File("${testDataDir}/parse-number-fxx-test-data")
-        if (!numbersTestDataDir.exists()) {
-            def grgit = Grgit.clone(dir: numbersTestDataDir, uri: 'https://github.com/nigeltao/parse-number-fxx-test-data.git')
-            grgit.close()
+def testdataParent = layout.projectDirectory.dir("testdata")
+def repoDir = testdataParent.dir("parse-number-fxx-test-data")
+
+tasks.register('prepareTestDataDir') {
+    description = 'Create testdata/ directory if missing'
+    doLast {
+        def parent = testdataParent.asFile
+        if (!parent.exists()) {
+            logger.lifecycle("Creating ${parent}")
+            parent.mkdirs()
         }
     }
 }
 
+tasks.register('downloadTestData', Exec) {
+    description = 'Clone parse-number-fxx-test-data into testdata/ if missing'
+    group = 'verification'
+    dependsOn tasks.named('prepareTestDataDir')
+
+    // Run if repo dir missing OR empty (handles half-created directories)
+    onlyIf {
+        def d = repoDir.asFile
+        !d.exists() || (d.isDirectory() && (d.listFiles() == null || d.listFiles().length == 0))
+    }
+
+    workingDir testdataParent.asFile
+    commandLine 'git', 'clone', 'https://github.com/nigeltao/parse-number-fxx-test-data.git', 'parse-number-fxx-test-data'
+
+    doFirst {
+        logger.lifecycle("Cloning parse-number-fxx-test-data into ${repoDir.asFile}")
+    }
+}
+
+tasks.withType(Test).configureEach {
+    dependsOn tasks.named('downloadTestData')
+}
+
 tasks.register('test256', Test) {
-    dependsOn downloadTestData
+    // IMPORTANT: run the normal test task first (no cycles)
+    dependsOn tasks.named('test')
+
     useJUnitPlatform()
     jvmArgs += [
             '--add-modules', 'jdk.incubator.vector',
@@ -90,7 +149,9 @@ tasks.register('test256', Test) {
 }
 
 tasks.register('test512', Test) {
-    dependsOn downloadTestData
+    // IMPORTANT: run the normal test task first (no cycles)
+    dependsOn tasks.named('test')
+
     useJUnitPlatform()
     jvmArgs += [
             '--add-modules', 'jdk.incubator.vector',
@@ -103,8 +164,21 @@ tasks.register('test512', Test) {
 }
 
 test {
-    dependsOn 'test256'
-    dependsOn 'test512'
+    // run JUnit 5 tests
+    useJUnitPlatform()
+
+    jvmArgs += [
+            '--add-modules', 'jdk.incubator.vector', '-Xmx2g'
+    ]
+
+    // Don't blow up if this particular task finds nothing
+    failOnNoDiscoveredTests = false
+}
+
+// Recommended: `./gradlew check` runs all test variants
+tasks.named('check') {
+    dependsOn tasks.named('test256')
+    dependsOn tasks.named('test512')
 }
 
 tasks.withType(JmhBytecodeGeneratorTask).configureEach {
@@ -206,15 +280,21 @@ if (System.getenv('GPG_KEY_ID')) {
 nexusPublishing {
     repositories {
         sonatype {
-            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
-            snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
-            stagingProfileId = '3c0bbfe420699e'
-            username = System.getenv('SONATYPE_USERNAME')
-            password = System.getenv('SONATYPE_PASSWORD')
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+
+            if (System.getenv('SONATYPE_USERNAME')) {
+                username.set(System.getenv('SONATYPE_USERNAME'))
+            }
+            if (System.getenv('SONATYPE_PASSWORD')) {
+                password.set(System.getenv('SONATYPE_PASSWORD'))
+            }
+
+            stagingProfileId.set('3c0bbfe420699e')
         }
     }
-    connectTimeout = Duration.ofMinutes(3)
-    clientTimeout = Duration.ofMinutes(3)
+    connectTimeout.set(Duration.ofMinutes(3))
+    clientTimeout.set(Duration.ofMinutes(3))
 }
 
 def getBooleanProperty(String name, boolean defaultValue) {

gradle/wrapper/gradle-wrapper.properties

@@ -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.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
+
 rootProject.name = 'simdjson-java'