From 5f68deda0fbbc2853dded0c90155e02ddee1c22b Mon Sep 17 00:00:00 2001 From: jilen Date: Thu, 23 Jun 2022 13:01:17 +0800 Subject: [PATCH] fix zinc binary dep for java internal classes --- .../worker/src/mill/scalalib/worker/MockedLookup.scala | 7 +++++-- .../worker/src/mill/scalalib/worker/ZincWorkerImpl.scala | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scalalib/worker/src/mill/scalalib/worker/MockedLookup.scala b/scalalib/worker/src/mill/scalalib/worker/MockedLookup.scala index 6990a6738e6c..26dffbf1db3b 100644 --- a/scalalib/worker/src/mill/scalalib/worker/MockedLookup.scala +++ b/scalalib/worker/src/mill/scalalib/worker/MockedLookup.scala @@ -13,6 +13,9 @@ case class MockedLookup(am: VirtualFile => Optional[CompileAnalysis]) override def analysis(classpathEntry: VirtualFile): Optional[CompileAnalysis] = am(classpathEntry) - override def definesClass(classpathEntry: VirtualFile): DefinesClass = - Locate.definesClass(classpathEntry) + override def definesClass(classpathEntry: VirtualFile): DefinesClass = { + if (classpathEntry.name.toString != "rt.jar") + Locate.definesClass(classpathEntry) + else (_: String) => false + } } diff --git a/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala b/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala index 4aff9d9a04a3..91521bd0cdaa 100644 --- a/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala +++ b/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala @@ -474,7 +474,7 @@ class ZincWorkerImpl( val store = FileAnalysisStore.binary(zincFile.toIO) - val converter = PlainVirtualFileConverter.converter + val converter = MappedFileConverter.empty val classpath = (compileClasspath.iterator ++ Some(classesDir)) .map(path => converter.toVirtualFile(path.toNIO)) .toArray