luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.x] fix: Fixes cross build caching (#9305) 

**Problem**
We can get into a situation where CompileInputs2 become identical for Scala 3.x and 2.13, which breaks the recovery of Zinc analysis.

**Solution**
This includes Scala version into CompileInput2 to workaround this issue.
This commit is contained in:
eugene yokota 2026-06-07 23:49:02 -04:00 committed by GitHub
parent b9e98b9e8a
commit 81ecab120a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Defaults.scala
View File

@ -2247,7 +2247,9 @@ object Defaults extends BuildCommon with DefExtra {
val dir = c.toPath(backendOutput.value).toFile
result match
case Result.Value(res) =>
val store = analysisStore(compileAnalysisFile.value.toPath(), c)
val af = compileAnalysisFile.value
val store = analysisStore(af.toPath(), c)
if !af.exists then sys.error(s"${af} is missing")
val analysis = store.unsafeGet().getAnalysis()
reporter.sendSuccessReport(analysis)
bspTask.notifySuccess(analysis)
@ -2445,6 +2447,7 @@ object Defaults extends BuildCommon with DefExtra {
c.toVirtualFile(inputs.options.classesDirectory),
c.toVirtualFile(inputs.setup.cacheFile.toPath),
incrementalOptions,
scalaVersion.value,
)
},
bspCompileTask :=

8
main/src/main/scala/sbt/internal/CompileInputs2.scala
View File

@ -13,6 +13,7 @@ case class CompileInputs2(
outputPath: VirtualFileRef,
cachePath: VirtualFileRef,
incrementalOptions: Vector[(String, String)],
scalaVersion: String,
)
object CompileInputs2:
@ -21,7 +22,8 @@ object CompileInputs2:
given IsoLList.Aux[
CompileInputs2,
Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: Vector[(String, String)] :*: LNil
Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: Vector[(String, String)] :*:
String :*: LNil
] =
LList.iso(
{ (v: CompileInputs2) =>
@ -32,12 +34,13 @@ object CompileInputs2:
("outputPath", v.outputPath) :*:
("cachePath", v.cachePath) :*:
("incrementalOptions", v.incrementalOptions) :*:
("scalaVersion", v.scalaVersion) :*:
LNil
},
{
(in: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: Vector[(String, String)] :*:
LNil) =>
String :*: LNil) =>
CompileInputs2(
in.head,
in.tail.head,
@ -46,6 +49,7 @@ object CompileInputs2:
in.tail.tail.tail.tail.head,
in.tail.tail.tail.tail.tail.head,
in.tail.tail.tail.tail.tail.tail.head,
in.tail.tail.tail.tail.tail.tail.tail.head,
)
}
)