chore: cleanup/upgrade guava to latest

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

Cargo.lock

@@ -77,7 +77,7 @@ gradleTestRetry = "1.6.2"
 grpc-java = "1.62.2"
 grpc-kotlin = "1.4.1"
 grpc-web = "1.4.2"
-guava = "33.4.0-jre-jpms"
+guava = "33.4.6-jre"
 h2 = "2.3.232"
 hamcrest-core = "2.2"
 hamcrest-junit = "2.0.0.0"

gradle/elide.versions.toml

@@ -14,14 +14,10 @@
 
 import elide.runtime.exec.GuestExecutor;
 import elide.runtime.gvm.EngineContextAPI;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.NotThreadSafe;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.jetbrains.annotations.NotNull;
 
-@Immutable
-@NotThreadSafe
 record EngineThreadContext(GuestExecutor executor, Engine engine, Context context)
     implements EngineContextAPI {
   @Override

packages/engine/src/main/java/elide/runtime/gvm/internals/EngineThreadContext.java

@@ -15,7 +15,6 @@ package elide.runtime.diag
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.function.Predicate
-import javax.annotation.concurrent.ThreadSafe
 import kotlinx.atomicfu.atomic
 import elide.runtime.diag.Severity.INFO
 
@@ -30,7 +29,7 @@ import elide.runtime.diag.Severity.INFO
  * Generally speaking, diagnostics are reported in cases where the engine intends to crash before continuing (compiler
  * errors, warnings in strict mode).
  */
-@ThreadSafe public class DiagnosticsContainer private constructor (initial: Sequence<DiagnosticInfo>? = null) :
+public class DiagnosticsContainer private constructor (initial: Sequence<DiagnosticInfo>? = null) :
   DiagnosticsReceiver, DiagnosticsSuite {
   // Whether this container has locked.
   private val isLocked = atomic(false)

packages/engine/src/main/kotlin/elide/runtime/diag/DiagnosticsContainer.kt

@@ -27,8 +27,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 
 class TypeScriptPrecompiledLoader extends AbstractTypeScriptLoader {
   private final TypeScriptPrecompiler precompiler;
@@ -39,7 +40,7 @@ public TypeScriptPrecompiledLoader(JSRealm realm, TypeScriptPrecompiler precompi
   }
 
   @NotNull private String resolveTsType(
-      @Nullable TruffleFile file, @NotNull String name, @Nullable Path path) {
+          @Nullable TruffleFile file, @NotNull String name, @Nullable Path path) {
     // typescript always defaults to esm
     var lang = "application/javascript+module";
 

packages/graalvm-ts/src/main/java/elide/runtime/lang/typescript/TypeScriptPrecompiledLoader.java

@@ -26,8 +26,9 @@
 import com.oracle.truffle.js.runtime.objects.ScriptOrModule;
 import java.io.IOException;
 import java.net.URI;
-import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 
 abstract class AbstractTypeScriptLoader extends NpmCompatibleESModuleLoader {
   protected AbstractTypeScriptLoader(JSRealm realm) {
@@ -61,7 +62,8 @@ protected AbstractTypeScriptLoader(JSRealm realm) {
     return super.resolveImportedModule(referrer, tsModuleRequest);
   }
 
-  @Nullable private AbstractModuleRecord loadAsTypeScriptFallback(
+  @Nullable
+  private AbstractModuleRecord loadAsTypeScriptFallback(
       @NotNull ScriptOrModule referrer,
       @NotNull Module.ModuleRequest request,
       @Nullable JSException e1) {

packages/graalvm-ts/src/main/java24x/elide/runtime/lang/typescript/AbstractTypeScriptLoader.java

@@ -135,7 +135,7 @@ public object Constants {
     const val NETTY = "4.1.118.Final"
 
     /** Guava version. */
-    const val GUAVA = "33.3.1-jre"
+    const val GUAVA = "33.4.6-jre"
 
     /** gRPC version. */
     const val GRPC = "1.62.2"