chore revert fix for #615 and apply sbt/sbt#5522

davidB · Jun 20, 2022 · 04445b1 · 04445b1
1 parent ef516b8
commit 04445b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/src/main/java/sbt_inc/SbtIncrementalCompiler.java b/src/main/java/sbt_inc/SbtIncrementalCompiler.java
@@ -29,8 +29,6 @@
 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;
@@ -118,7 +116,9 @@ public Optional<CompileAnalysis> analysis(VirtualFile classpathEntry) {
 
           @Override
           public DefinesClass definesClass(VirtualFile classpathEntry) {
-            return Locate.definesClass(classpathEntry);
+            return classpathEntry.name().equals("rt.jar")
+                ? className -> false
+                : Locate.definesClass(classpathEntry);
           }
         };
 
@@ -158,11 +158,6 @@ 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()
@@ -176,7 +171,7 @@ public void compile(
             pos -> pos, // sourcePositionMappers
             compileOrder, // order
             Optional.empty(), // temporaryClassesDirectory
-            fileConverter, // _converter
+            Optional.empty(), // _converter
             Optional.empty(), // _stamper
             Optional.empty() // _earlyOutput
             );

diff --git a/src/main/java/util/JavaVersion.java b/src/main/java/util/JavaVersion.java