Upgrade Gradle from 8.1 to 8.8

Author: KHiyowa

build.gradle

@@ -1,9 +1,10 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 
 plugins {
     id 'java-library'
-    id 'org.jetbrains.kotlin.jvm' version '1.8.0'
-    id "org.jetbrains.kotlin.plugin.serialization" version "1.8.0"
+    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+    id "org.jetbrains.kotlin.plugin.serialization" version "2.0.20"
     id 'com.diffplug.spotless' version '6.16.0'
     id 'org.sonarqube' version '4.0.0.2929'
     id("org.jetbrains.kotlinx.kover") version "0.7.0"
@@ -16,12 +17,18 @@ group = 'com.worksap.nlp'
 archivesBaseName = 'analysis-sudachi'
 version = properties["pluginVersion"]
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 compileKotlin {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 compileTestKotlin {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 configurations {

buildSrc/src/main/groovy/com/worksap/nlp/tools/EsConventions.groovy

@@ -2,17 +2,10 @@ package com.worksap.nlp.tools
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.compile.JavaCompile
 
 class EsConventions implements Plugin<Project> {
     @Override
     void apply(Project target) {
-        target.tasks.withType(JavaCompile).configureEach {
-            options.release.set(17)
-            options.encoding = 'UTF-8'
-        }
-
-
         target.repositories {
             mavenLocal()
             mavenCentral()

buildSrc/src/main/groovy/com/worksap/nlp/tools/EsTestEnvPlugin.groovy

@@ -2,6 +2,7 @@ package com.worksap.nlp.tools
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.Action
 import org.gradle.api.Task
 import org.gradle.api.Transformer
 import org.gradle.api.model.ObjectFactory
@@ -49,67 +50,6 @@ class PluginDescriptor {
     }
 }
 
-class StringProvider implements Provider<String>, Serializable {
-    private static final long serialVersionUID = 42L
-    String value
-
-    @Override
-    String get() {
-        return value
-    }
-
-    @Override
-    String getOrNull() {
-        return value
-    }
-
-    @Override
-    String getOrElse(String defaultValue) {
-        if (value == null) return defaultValue else return value
-    }
-
-    @Override
-    def <S> Provider<S> map(Transformer<? extends S, ? super String> transformer) {
-        throw new IllegalStateException("not implemented")
-    }
-
-    @Override
-    def <S> Provider<S> flatMap(Transformer<? extends Provider<? extends S>, ? super String> transformer) {
-        throw new IllegalStateException("not implemented")
-    }
-
-    @Override
-    boolean isPresent() {
-        return value != null
-    }
-
-    @Override
-    Provider<String> orElse(String value) {
-        return this
-    }
-
-    @Override
-    Provider<String> orElse(Provider<? extends String> provider) {
-        if (value == null) return provider else return this
-    }
-
-    @Override
-    Provider<String> forUseAtConfigurationTime() {
-        return this
-    }
-
-    @Override
-    def <U, R> Provider<R> zip(Provider<U> right, BiFunction<? super String, ? super U, ? extends R> combiner) {
-        throw new IllegalStateException("not implemented")
-    }
-
-
-    @Override
-    String toString() {
-        return value;
-    }
-}
-
 class EsTestEnvPlugin implements Plugin<Project> {
 
     private final ObjectFactory objectFactory
@@ -124,14 +64,28 @@ class EsTestEnvPlugin implements Plugin<Project> {
         EsTestEnvExtension ext = new EsTestEnvExtension()
         target.extensions.add(EsTestEnvExtension.class, "esTestEnv", ext)
         target.tasks.named("test").configure { Test task ->
-            Provider<String> envRoot = new StringProvider()
+            // Determine the final, unique path for this test run during the configuration phase.
+            // This is required because the test JVM is forked before the task's actions run,
+            // and it needs java.io.tmpdir to exist on startup. A newer/faster JDK can expose
+            // this timing issue.
+            def formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH-mm-ss-SSS", Locale.ROOT)
+            def now = Instant.now().atZone(ZoneId.of("UTC"))
+            def timepart = formatter.format(now)
             Path esHomePath = target.buildDir.toPath().resolve("es-env")
-            envRoot.setValue(esHomePath.toString())
-            task.systemProperty("sudachi.es.root", envRoot)
+            Path finalEnvRootPath = esHomePath.resolve(timepart)
+
+            // Create the directory during configuration. This is generally an anti-pattern,
+            // but necessary to prevent the "java.io.tmpdir directory does not exist" warning from the forked JVM.
+            Files.createDirectories(finalEnvRootPath)
+
+            task.systemProperty("sudachi.es.root", finalEnvRootPath.toString())
+            task.systemProperty("java.io.tmpdir", finalEnvRootPath.toString())
+
             task.doFirst {
-                envRoot.setValue(prepareEnvironment(target, task, esHomePath, ext).toString())
+                // The root directory is already created, just populate it with files.
+                populateEnvironment(target, task, finalEnvRootPath, ext)
             }
-            task.doLast { cleanupEnvironment(esHomePath) }
+            task.doLast { cleanupEnvironment(target, esHomePath) }
             ext.additionalPlugins.forEach {
                 if (it.value instanceof TaskProvider || it.value instanceof Task) {
                     dependsOn(it.value)
@@ -147,7 +101,18 @@ class EsTestEnvPlugin implements Plugin<Project> {
             task.systemProperty("tests.task", task.getPath())
             task.systemProperty("gradle.dist.lib", gradleRtDir.resolve("lib").toString())
             task.systemProperty("gradle.worker.jar", gradleCacheDir.resolve("workerMain/gradle-worker.jar").toString())
-            task.systemProperty("java.io.tmpdir", envRoot)
+
+            // OpenSearch test framework requires reflective access to JDK internals, which is restricted on Java 17+.
+            // It also uses a Security Manager, which is disabled by default in Java 17+.
+            // We need to add JVM arguments to re-enable these features for the tests to run.
+            def esExtension = target.extensions.findByName("sudachiEs")
+            if (esExtension != null && esExtension.kind.get().engine == EngineType.OpenSearch) {
+                task.jvmArgs(
+                        '--add-opens=java.base/java.lang=ALL-UNNAMED'
+                )
+                // Allow the test framework to set a Security Manager
+                task.systemProperty("java.security.manager", "allow")
+            }
         }
 
         target.gradle.taskGraph.whenReady {
@@ -172,12 +137,8 @@ class EsTestEnvPlugin implements Plugin<Project> {
         }
     }
 
-    private Path prepareEnvironment(Project project, Test testTask, Path basePath, EsTestEnvExtension ext) {
-        def formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH-mm-ss", Locale.ROOT)
-        def now = Instant.now().atZone(ZoneId.of("UTC"))
-        def timepart = formatter.format(now)
-        def rootPath = basePath.resolve(timepart)
-
+    /** Populates the pre-created environment directory with necessary files for the test run. */
+    private void populateEnvironment(Project project, Test testTask, Path rootPath, EsTestEnvExtension ext) {
         def pluginDir = rootPath.resolve("plugins")
         def configPath = rootPath.resolve("config")
 
@@ -204,12 +165,10 @@ class EsTestEnvPlugin implements Plugin<Project> {
         Files.createDirectories(sudachiConfigDir)
         Files.copy(ext.systemDic, sudachiConfigDir.resolve("system_core.dic"))
         Files.copy(ext.configFile, sudachiConfigDir.resolve("sudachi.json"))
-
-        return rootPath
     }
 
-    private void cleanupEnvironment(Path envPath) {
-
+    private void cleanupEnvironment(Project project, Path envPath) {
+        // project.delete(envPath)
     }
 
 
@@ -273,5 +232,3 @@ class EsTestEnvPlugin implements Plugin<Project> {
                 .writeTo(outputStream.newWriter('utf-8'))
     }
 }
-
-

gradle.properties

@@ -3,12 +3,7 @@
 # opensearch version: 2.18.0, 2.17.1, 2.16.0, 2.15.0, 2.14.0, 2.13.0, 2.12.0, 2.11.1, 
 #     2.10.0, 2.9.0, 2.8.0, 2.7.0, 2.6.0
 engineVersion=es:8.19.2
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=350m \
-  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=350m
 org.gradle.caching=true
 org.gradle.parallel=true
 pluginVersion=3.3.1-SNAPSHOT

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -14,11 +14,11 @@ plugins {
 version = properties["pluginVersion"]
 
 compileKotlin {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 compileTestKotlin {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 configurations { buildSudachiDict }