Pick different FileConverters depending on the Java version, close #615

davidB · Jun 17, 2022 · 4eafa8b · 4eafa8b
1 parent d6b75f6
commit 4eafa8b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/sbt_inc/SbtIncrementalCompiler.java b/src/main/java/sbt_inc/SbtIncrementalCompiler.java
@@ -29,6 +29,8 @@
 import scala.Tuple2;
 import scala_maven.MavenArtifactResolver;
 import util.FileUtils;
+import util.JavaVersion;
+import xsbti.FileConverter;
 import xsbti.PathBasedFile;
 import xsbti.T2;
 import xsbti.VirtualFile;
@@ -156,6 +158,11 @@ public void compile(
     fullClasspath.add(classesDirectory);
     fullClasspath.addAll(classpathElements);
 
+    Optional<FileConverter> fileConverter =
+        JavaVersion.JAVA_MAJOR_VERSION >= 9
+            ? Optional.empty()
+            : Optional.of(PlainVirtualFileConverter.converter());
+
     CompileOptions options =
         CompileOptions.of(
             fullClasspath.stream()
@@ -169,7 +176,7 @@ public void compile(
             pos -> pos, // sourcePositionMappers
             compileOrder, // order
             Optional.empty(), // temporaryClassesDirectory
-            Optional.empty(), // _converter
+            fileConverter, // _converter
             Optional.empty(), // _stamper
             Optional.empty() // _earlyOutput
             );

diff --git a/src/main/java/util/JavaVersion.java b/src/main/java/util/JavaVersion.java
@@ -0,0 +1,19 @@
+/*
+ * This is free and unencumbered software released into the public domain.
+ * See UNLICENSE.
+ */
+package util;
+
+public final class JavaVersion {
+
+  private JavaVersion() {}
+
+  public static final int JAVA_MAJOR_VERSION;
+
+  static {
+    String javaSpecVersion = System.getProperty("java.specification.version");
+    String[] components = javaSpecVersion.split("\\.");
+    int component0 = Integer.parseInt(components[0]);
+    JAVA_MAJOR_VERSION = component0 == 1 ? Integer.parseInt(components[1]) : component0;
+  }
+}