diff --git a/build.sbt b/build.sbt index d84dcfee1..460d05bcb 100644 --- a/build.sbt +++ b/build.sbt @@ -232,7 +232,7 @@ lazy val snapiTruffle = (project in file("snapi-truffle")) runJavaAnnotationProcessor := { println("Running Java annotation processor") - val annotationProcessorJar = baseDirectory.value / "truffle-dsl-processor-23.1.0.jar" + val annotationProcessorJar = baseDirectory.value / "truffle-dsl-processor-24.0.1.jar" val javaSources = baseDirectory.value / "src" / "main" / "java" val targetDir = baseDirectory.value / "target" / "java-processed-sources" @@ -241,10 +241,8 @@ lazy val snapiTruffle = (project in file("snapi-truffle")) val javacOptions = Seq( "javac", - "-source", - "21", - "-target", - "21", + "--release", + "22", "-d", targetDir.getAbsolutePath, "--module-path", @@ -378,5 +376,5 @@ lazy val pythonClient = (project in file("python-client")) missingInterpolatorCompileSettings, testSettings, Compile / packageBin / packageOptions += Package.ManifestAttributes("Automatic-Module-Name" -> "raw.python.client"), - libraryDependencies += "org.graalvm.polyglot" % "python" % "23.1.0" % Provided + libraryDependencies += "org.graalvm.polyglot" % "python" % "24.0.1" % Provided ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2eb8b58ee..a9c951b24 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -47,7 +47,7 @@ object Dependencies { // from client - val trufflePolyglot = "org.graalvm.polyglot" % "polyglot" % "23.1.0" + val trufflePolyglot = "org.graalvm.polyglot" % "polyglot" % "24.0.1" // from snapi-parser @@ -78,12 +78,12 @@ object Dependencies { val jwtCore = "com.github.jwt-scala" %% "jwt-core" % "9.4.4-rawlabs" val springCore = "org.springframework" % "spring-core" % "5.3.13" val truffleCompiler = Seq( - "org.graalvm.truffle" % "truffle-api" % "23.1.0", - "org.graalvm.truffle" % "truffle-api" % "23.1.0", - "org.graalvm.truffle" % "truffle-compiler" % "23.1.0", - "org.graalvm.truffle" % "truffle-nfi" % "23.1.0", - "org.graalvm.truffle" % "truffle-nfi-libffi" % "23.1.0", - "org.graalvm.truffle" % "truffle-runtime" % "23.1.0" + "org.graalvm.truffle" % "truffle-api" % "24.0.1", + "org.graalvm.truffle" % "truffle-api" % "24.0.1", + "org.graalvm.truffle" % "truffle-compiler" % "24.0.1", + "org.graalvm.truffle" % "truffle-nfi" % "24.0.1", + "org.graalvm.truffle" % "truffle-nfi-libffi" % "24.0.1", + "org.graalvm.truffle" % "truffle-runtime" % "24.0.1" ) val scalaCompiler = Seq( "org.scala-lang" % "scala-compiler" % "2.12.18", diff --git a/rebuild.sh b/rebuild.sh index c607b63f7..1833a4740 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -10,8 +10,8 @@ export COURSIER_PROGRESS=false [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes n | sdk install java 21.0.1-graalce || true -sdk use java 21.0.1-graalce +yes n | sdk install java 22.0.1-graalce || true +sdk use java 22.0.1-graalce cd "${SCRIPT_HOME}" sbt clean compile diff --git a/snapi-truffle/src/main/resources/META-INF/services/com.oracle.truffle.api.provider.TruffleLanguageProvider b/snapi-truffle/src/main/resources/META-INF/services/com.oracle.truffle.api.provider.TruffleLanguageProvider new file mode 100644 index 000000000..adde6e9a2 --- /dev/null +++ b/snapi-truffle/src/main/resources/META-INF/services/com.oracle.truffle.api.provider.TruffleLanguageProvider @@ -0,0 +1 @@ +raw.runtime.truffle.RawLanguageProvider \ No newline at end of file diff --git a/snapi-truffle/truffle-dsl-processor-23.1.0.jar b/snapi-truffle/truffle-dsl-processor-24.0.1.jar similarity index 69% rename from snapi-truffle/truffle-dsl-processor-23.1.0.jar rename to snapi-truffle/truffle-dsl-processor-24.0.1.jar index a6ed7b47e..1c1bf7737 100644 Binary files a/snapi-truffle/truffle-dsl-processor-23.1.0.jar and b/snapi-truffle/truffle-dsl-processor-24.0.1.jar differ