Skip to content

Commit f386f6b

Browse files
committed
chore: cleanup/upgrade guava to latest
Signed-off-by: Sam Gammon <[email protected]>
1 parent 00ae6bc commit f386f6b

File tree

7 files changed

+27
-32
lines changed

7 files changed

+27
-32
lines changed

Cargo.lock

+22-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/elide.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ gradleTestRetry = "1.6.2"
7777
grpc-java = "1.62.2"
7878
grpc-kotlin = "1.4.1"
7979
grpc-web = "1.4.2"
80-
guava = "33.4.0-jre-jpms"
80+
guava = "33.4.6-jre"
8181
h2 = "2.3.232"
8282
hamcrest-core = "2.2"
8383
hamcrest-junit = "2.0.0.0"

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

-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@
1414

1515
import elide.runtime.exec.GuestExecutor;
1616
import elide.runtime.gvm.EngineContextAPI;
17-
import javax.annotation.concurrent.Immutable;
18-
import javax.annotation.concurrent.NotThreadSafe;
1917
import org.graalvm.polyglot.Context;
2018
import org.graalvm.polyglot.Engine;
2119
import org.jetbrains.annotations.NotNull;
2220

23-
@Immutable
24-
@NotThreadSafe
2521
record EngineThreadContext(GuestExecutor executor, Engine engine, Context context)
2622
implements EngineContextAPI {
2723
@Override

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package elide.runtime.diag
1515
import java.util.concurrent.ConcurrentHashMap
1616
import java.util.concurrent.ConcurrentLinkedQueue
1717
import java.util.function.Predicate
18-
import javax.annotation.concurrent.ThreadSafe
1918
import kotlinx.atomicfu.atomic
2019
import elide.runtime.diag.Severity.INFO
2120

@@ -30,7 +29,7 @@ import elide.runtime.diag.Severity.INFO
3029
* Generally speaking, diagnostics are reported in cases where the engine intends to crash before continuing (compiler
3130
* errors, warnings in strict mode).
3231
*/
33-
@ThreadSafe public class DiagnosticsContainer private constructor (initial: Sequence<DiagnosticInfo>? = null) :
32+
public class DiagnosticsContainer private constructor (initial: Sequence<DiagnosticInfo>? = null) :
3433
DiagnosticsReceiver, DiagnosticsSuite {
3534
// Whether this container has locked.
3635
private val isLocked = atomic(false)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import java.nio.file.Files;
2828
import java.nio.file.Path;
2929
import java.nio.file.Paths;
30-
import javax.annotation.Nullable;
3130
import org.jetbrains.annotations.NotNull;
31+
import org.jetbrains.annotations.Nullable;
3232

3333
class TypeScriptPrecompiledLoader extends AbstractTypeScriptLoader {
3434
private final TypeScriptPrecompiler precompiler;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import com.oracle.truffle.js.runtime.objects.ScriptOrModule;
2727
import java.io.IOException;
2828
import java.net.URI;
29-
import javax.annotation.Nullable;
3029
import org.jetbrains.annotations.NotNull;
30+
import org.jetbrains.annotations.Nullable;
3131

3232
abstract class AbstractTypeScriptLoader extends NpmCompatibleESModuleLoader {
3333
protected AbstractTypeScriptLoader(JSRealm realm) {

tools/elide-build/src/main/kotlin/elide/internal/conventions/Constants.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public object Constants {
135135
const val NETTY = "4.1.118.Final"
136136

137137
/** Guava version. */
138-
const val GUAVA = "33.3.1-jre"
138+
const val GUAVA = "33.4.6-jre"
139139

140140
/** gRPC version. */
141141
const val GRPC = "1.62.2"

0 commit comments

Comments
 (0)