enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 13:02:07 +03:00
Code Issues Projects Releases Wiki Activity

Switching to Java 19 Frgaal compiler (#3594)

Browse Source 
Updating to Frgaal 19.0.0-RC1 to give us access to latest Java features including pattern matching on `record` classes. Builds upon #3421.
This commit is contained in:
Jaroslav Tulach 2022-07-19 11:28:31 +02:00 committed by GitHub
parent 7fa4e5e369
commit 030e46bfb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -1154,7 +1154,7 @@ val distributionEnvironmentOverrides = {
) )
} }
val frgaalSourceLevel = "18" val frgaalSourceLevel = "19"
/** A setting to replace javac with Frgaal compiler, allowing to use latest Java features in the code /** A setting to replace javac with Frgaal compiler, allowing to use latest Java features in the code
* and still compile down to JDK 11 * and still compile down to JDK 11

4
project/FrgaalJavaCompiler.scala
View File

@ -23,7 +23,7 @@ import scala.sys.process.Process
object FrgaalJavaCompiler { object FrgaalJavaCompiler {
val frgaal = "org.frgaal" % "compiler" % "18.0.0" % "provided" val frgaal = "org.frgaal" % "compiler" % "19.0.0-RC1" % "provided"
def compilers(classpath: sbt.Keys.Classpath, sbtCompilers: xsbti.compile.Compilers, javaVersion: String) = { def compilers(classpath: sbt.Keys.Classpath, sbtCompilers: xsbti.compile.Compilers, javaVersion: String) = {
// Enable Java 11+ features by invoking Frgaal instead of regular javac // Enable Java 11+ features by invoking Frgaal instead of regular javac
@ -69,7 +69,7 @@ object FrgaalJavaCompiler {
withArgumentFile(allArguments) { argsFile => withArgumentFile(allArguments) { argsFile =>
// Need to disable standard compiler tools that come with used jdk and replace them // Need to disable standard compiler tools that come with used jdk and replace them
// with the ones provided with Frgaal. // with the ones provided with Frgaal.
val forkArgs = (jArgs ++ Seq("--limit-modules", "java.base,jdk.zipfs", "-jar", compilerJar.toString)) :+ val forkArgs = (jArgs ++ Seq("--limit-modules", "java.base,jdk.zipfs,jdk.internal.vm.compiler.management", "-jar", compilerJar.toString)) :+
s"@${normalizeSlash(argsFile.getAbsolutePath)}" s"@${normalizeSlash(argsFile.getAbsolutePath)}"
val exe = getJavaExecutable(javaHome, "java") val exe = getJavaExecutable(javaHome, "java")
val cwd = new File(new File(".").getAbsolutePath).getCanonicalFile val cwd = new File(new File(".").getAbsolutePath).getCanonicalFile