enso-org · mergify · Oct 29, 2025 · Sep 17, 2025 · Sep 17, 2025 · Sep 18, 2025
diff --git a/.bazelrc b/.bazelrc
@@ -31,11 +31,11 @@ common --@aspect_rules_ts//ts:default_to_tsc_transpiler
 startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
 ## GraalVM versions
-common --tool_java_runtime_version=graalvm_24
-common --tool_java_language_version=24
+common --tool_java_runtime_version=graalvm_25
+common --tool_java_language_version=25
 
-common --java_runtime_version=graalvm_24
-common --java_language_version=24
+common --java_runtime_version=graalvm_25
+common --java_language_version=25
 
 ## Rust
 startup --windows_enable_symlinks

@@ -125,7 +125,7 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: "24.0.1"
+          java-version: "25.0.0"
           distribution: "graalvm-community"
 
       - name: Publish Enso Libraries to Local Maven Repository

@@ -8,7 +8,7 @@ on:
 
 env:
   # Please ensure that this is in sync with graalVersion in build.sbt
-  javaVersion: 24.0.1
+  javaVersion: 25.0.0
   # Please ensure that this is in sync with project/build.properties
   sbtVersion: 1.10.6
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - [Autocompletion for table expression builtin functions in table
   expressions][13914]
 - [Autocompletion for table expression operators and operands][13917]
+- [Update to GraalVM 25][14019]
 
 [14003]: https://github.com/enso-org/enso/pull/14003
 [13978]: https://github.com/enso-org/enso/pull/13978
@@ -47,6 +48,7 @@
 [13909]: https://github.com/enso-org/enso/pull/13909
 [13914]: https://github.com/enso-org/enso/pull/13914
 [13917]: https://github.com/enso-org/enso/pull/13917
+[14019]: https://github.com/enso-org/enso/pull/14019
 
 # Enso 2025.2
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -147,7 +147,7 @@ git_override(
     commit = "81fc9b2de33c0429b716f1bfcd3223a82c0e1085",
     patch_strip = 1,
     patches = [
-        "patches/rules_graalvm_java24.patch",
+        "patches/rules_graalvm_java25.patch",
         "patches/rules_graalvm_tool_toolchain.patch",
     ],
     remote = "https://github.com/sgammon/rules_graalvm.git",
@@ -157,8 +157,8 @@ gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")
 gvm.graalvm(
     name = "graalvm",
     distribution = "ce",  # `oracle`, `ce`, or `community`
-    java_version = "24",  # `17`, `20`, `21`, or `22` as supported by the version provided
-    version = "24.0.1",  # gvm sdk version format like `24.x.x` also supported
+    java_version = "25",  # `17`, `20`, `21`, or `22` as supported by the version provided
+    version = "25.0.0",  # gvm sdk version format like `24.x.x` also supported
 )
 use_repo(gvm, "graalvm")
 

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
@@ -583,6 +583,36 @@ lazy val modularFatJarWrapperSettings = frgaalJavaCompilerSetting ++ Seq(
   Compile / exportedModule := (Compile / exportedModuleBin).value
 )
 
+/** Mockito agent needs to be explicitly set as `-javaagent` to the JVM.
+  * Note that starting agent programatically was deprecated in JDK 21 and is scheduled to be removed.
+  * See https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3
+  */
+lazy val mockitoAgentSettings: SettingsDefinition = Seq(
+  libraryDependencies ++= Seq(
+    "org.mockito" % "mockito-core" % mockitoJavaVersion % Test
+  ),
+  Test / javaOptions += {
+    val logger = streams.value.log
+    val mockitoJar = JPMSUtils.filterModulesFromUpdate(
+      update.value,
+      Seq(
+        "org.mockito" % "mockito-core" % mockitoJavaVersion
+      ),
+      logger,
+      moduleName.value,
+      scalaBinaryVersion.value,
+      shouldContainAll = true
+    )
+    if (mockitoJar.length != 1) {
+      logger.error(
+        s"Expected exactly one mockito-core jar on the classpath, found: ${mockitoJar.map(_.name).mkString(", ")}"
+      )
+    }
+    val mockitoJarPath = mockitoJar.head.getAbsolutePath
+    s"-javaagent:$mockitoJarPath"
+  }
+)
+
 // ============================================================================
 // === Internal Libraries =====================================================
 // ============================================================================
@@ -3365,6 +3395,7 @@ lazy val `runtime-compiler` =
       scalaModuleDependencySetting,
       mixedJavaScalaProjectSetting,
       annotationProcSetting,
+      mockitoAgentSettings,
       inConfig(Test)(truffleRunOptionsSettings),
       commands += WithDebugCommand.withDebug,
       javaModuleName := "org.enso.runtime.compiler",
@@ -3964,6 +3995,10 @@ lazy val `engine-runner` = project
           "org.enso.microsoft.nativeimage.AzureNativeImageFeature"
         val databaseFeature =
           "org.enso.database.nativeimage.SqliteJdbcPatchedFeature"
+        // Features from gax-grpc-2.31.0
+        val grpcFeatures =
+          "com.google.api.gax.grpc.nativeimage.ProtobufMessageFeature," +
+          "com.google.api.gax.grpc.nativeimage.GrpcNettyFeature"
         val features = Seq(
           "org.enso.interpreter.runtime.nativeimage.NativeLibraryFeature"
         ) ++ (if (areStdlibsIncluded) Seq(databaseFeature, azureFeature)
@@ -4001,14 +4036,14 @@ lazy val `engine-runner` = project
             // native library from the jar.
             excludeConfigs = Seq(
               s".*sqlite-jdbc-.*\\.jar,META-INF/native-image/org\\.xerial/sqlite-jdbc/native-image\\.properties",
-              s".*snowflake-jdbc-.*\\.jar,META-INF/native-image/.*"
+              s".*snowflake-jdbc-.*\\.jar,META-INF/native-image/.*",
+              ".*gax-grpc-.*\\.jar,META-INF/native-image/com.google.api/gax-grpc/native-image.properties"
             ),
             modulePath = mp,
             additionalOptions = Seq(
               "-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog",
               "-H:+AddAllCharsets",
               "-H:+IncludeAllLocales",
-              "-H:+RunReachabilityHandlersConcurrently",
               "-R:-InstallSegfaultHandler",
               // Workaround a problem with build-/runtime-initialization conflict
               // by disabling this service provider
@@ -4018,7 +4053,9 @@ lazy val `engine-runner` = project
               // Needed for the NativeLibraryFeature
               "--add-opens=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=ALL-UNNAMED",
               // Snowflake uses Apache Arrow (equivalent of #9664 in native-image setup)
-              "--add-opens=java.base/java.nio=ALL-UNNAMED"
+              "--add-opens=java.base/java.nio=ALL-UNNAMED",
+              // Needed for grpc-gax
+              "--add-opens=java.base/java.time=ALL-UNNAMED"
             ) ++ enableHeapDumpOpts ++ debugOpts,
             mainModule = Some("org.enso.runner"),
             mainClass  = Some("org.enso.runner.Main"),
@@ -5184,6 +5221,7 @@ lazy val `std-table` = project
   .enablePlugins(Antlr4Plugin)
   .settings(
     frgaalJavaCompilerSetting,
+    mockitoAgentSettings,
     autoScalaLibrary := false,
     Compile / compile / compileInputs := (Compile / compile / compileInputs)
       .dependsOn(SPIHelpers.ensureSPIConsistency)

diff --git a/build_tools/ci_utils/src/cache/goodie/graalvm.rs b/build_tools/ci_utils/src/cache/goodie/graalvm.rs
@@ -132,7 +132,7 @@ impl Goodie for GraalVM {
         let dir_name = graalvm_dir.file_name();
         let dir_name = dir_name.as_str();
         ensure!(dir_name.contains("graalvm"));
-        ensure!(dir_name.contains(self.graal_version.to_string_core().as_str()));
+        ensure!(dir_name.contains(self.graal_version.major.to_string().as_str()));
         let root = match TARGET_OS {
             OS::MacOS => graalvm_dir.path().join_iter(["Contents", "Home"]),
             _ => graalvm_dir.path(),