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

Add cachePath to CompileInputs2 to fix dependency-management/test-artifact 

We cannot recover compilation after the path of the Zinc cache changed
This commit is contained in:
Adrien Piquerez 2024-08-27 16:02:27 +02:00
parent 47c60bab2e
commit b1564d4888
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2712,6 +2712,7 @@ object Defaults extends BuildCommon {
scalacOptions.value.toVector, scalacOptions.value.toVector,
javacOptions.value.toVector, javacOptions.value.toVector,
c.toVirtualFile(inputs.options.classesDirectory), c.toVirtualFile(inputs.options.classesDirectory),
c.toVirtualFile(inputs.setup.cacheFile.toPath)
) )
}, },
bspCompileTask := bspCompileTask :=

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

@ -11,6 +11,7 @@ case class CompileInputs2(
scalacOptions: Vector[String], scalacOptions: Vector[String],
javacOptions: Vector[String], javacOptions: Vector[String],
outputPath: VirtualFileRef, outputPath: VirtualFileRef,
cachePath: VirtualFileRef
) )
object CompileInputs2: object CompileInputs2:
@ -19,7 +20,7 @@ object CompileInputs2:
given IsoLList.Aux[ given IsoLList.Aux[
CompileInputs2, CompileInputs2,
Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
Vector[String] :*: VirtualFileRef :*: LNil Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: LNil
] = ] =
LList.iso( LList.iso(
{ (v: CompileInputs2) => { (v: CompileInputs2) =>
@ -28,17 +29,19 @@ object CompileInputs2:
("scalacOptions", v.scalacOptions) :*: ("scalacOptions", v.scalacOptions) :*:
("javacOptions", v.javacOptions) :*: ("javacOptions", v.javacOptions) :*:
("outputPath", v.outputPath) :*: ("outputPath", v.outputPath) :*:
("cachePath", v.cachePath) :*:
LNil LNil
}, },
{ {
(in: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*: (in: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
Vector[String] :*: VirtualFileRef :*: LNil) => Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: LNil) =>
CompileInputs2( CompileInputs2(
in.head, in.head,
in.tail.head, in.tail.head,
in.tail.tail.head, in.tail.tail.head,
in.tail.tail.tail.head, in.tail.tail.tail.head,
in.tail.tail.tail.tail.head in.tail.tail.tail.tail.head,
in.tail.tail.tail.tail.tail.head
) )
} }
) )