From 5966cc5dd2cf53b1a96d7a8a1eb8df0b4045cdc5 Mon Sep 17 00:00:00 2001 From: Nick Pavlov Date: Wed, 1 May 2024 11:07:29 +0300 Subject: [PATCH] Fix graal --- api/api/src/main/scala/aqua/api/Imports.scala | 1 + build.sbt | 10 ++++++---- .../src/main/scala/aqua/compiler/Library.scala | 6 ++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/api/api/src/main/scala/aqua/api/Imports.scala b/api/api/src/main/scala/aqua/api/Imports.scala index 880dad2fd..f2ff23e30 100644 --- a/api/api/src/main/scala/aqua/api/Imports.scala +++ b/api/api/src/main/scala/aqua/api/Imports.scala @@ -12,6 +12,7 @@ final case class Imports( settings: Map[Path, Imports.PathSettings] ) { + def toIO: IOImports = IOImports( settings.view diff --git a/build.sbt b/build.sbt index b1d442745..2bb3738a0 100644 --- a/build.sbt +++ b/build.sbt @@ -219,8 +219,7 @@ lazy val `compiler-native-lib` = project .settings( name := "libaqua", Compile / mainClass := Some("aqua.compiler.Library"), - nativeImageJvm := "graalvm-java20", - nativeImageVersion:="20.0.2", + nativeImageVersion:="22.3.1", nativeImageOptions ++= Seq( "--verbose", "--no-fallback", @@ -228,8 +227,11 @@ lazy val `compiler-native-lib` = project "--initialize-at-run-time=aqua.logging.LogFormatter$", // Uncomment next lines to use llvm backend // and obtain bitcode files - // "-H:CompilerBackend=llvm", - // "-H:TempDirectory=temp", // Directory with bc files + // "-H:CompilerBackend=llvm", + // "-H:TempDirectory=temp", // Directory with bc files + ), + libraryDependencies ++= Seq( + "org.graalvm.sdk" % "graal-sdk" % "24.0.1" ) ) .dependsOn(`aqua-api`.jvm) diff --git a/compiler-native-lib/src/main/scala/aqua/compiler/Library.scala b/compiler-native-lib/src/main/scala/aqua/compiler/Library.scala index 9bf3e6f66..a57076179 100644 --- a/compiler-native-lib/src/main/scala/aqua/compiler/Library.scala +++ b/compiler-native-lib/src/main/scala/aqua/compiler/Library.scala @@ -5,10 +5,8 @@ import org.graalvm.nativeimage.c.function.CEntryPoint import org.graalvm.nativeimage.c.`type`.{CCharPointer, CCharPointerPointer, CTypeConversion} import scala.annotation.static - import cats.effect.unsafe.implicits.global - -import aqua.api.{APICompilation, AquaAPIConfig} +import aqua.api.{APICompilation, AquaAPIConfig, Imports} import aqua.backend.api.APIBackend import aqua.logging.LogFormatter @@ -32,7 +30,7 @@ object Library { val result = APICompilation .compileString( code, - imports = Nil, + imports = Imports(Map.empty), aquaConfig = AquaAPIConfig(), backend = APIBackend )