From b1564d4888143b7e4aa2259e554bf6ac1976beb9 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Tue, 27 Aug 2024 16:02:27 +0200
Subject: [PATCH] Add cachePath to CompileInputs2 to fix
 dependency-management/test-artifact

We cannot recover compilation after the path of the Zinc cache changed
---
 main/src/main/scala/sbt/Defaults.scala                | 1 +
 main/src/main/scala/sbt/internal/CompileInputs2.scala | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 239f5f52e..125e3dd82 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2712,6 +2712,7 @@ object Defaults extends BuildCommon {
           scalacOptions.value.toVector,
           javacOptions.value.toVector,
           c.toVirtualFile(inputs.options.classesDirectory),
+          c.toVirtualFile(inputs.setup.cacheFile.toPath)
         )
       },
       bspCompileTask :=
diff --git a/main/src/main/scala/sbt/internal/CompileInputs2.scala b/main/src/main/scala/sbt/internal/CompileInputs2.scala
index 923f1fcb2..34835c70c 100644
--- a/main/src/main/scala/sbt/internal/CompileInputs2.scala
+++ b/main/src/main/scala/sbt/internal/CompileInputs2.scala
@@ -11,6 +11,7 @@ case class CompileInputs2(
     scalacOptions: Vector[String],
     javacOptions: Vector[String],
     outputPath: VirtualFileRef,
+    cachePath: VirtualFileRef
 )
 
 object CompileInputs2:
@@ -19,7 +20,7 @@ object CompileInputs2:
   given IsoLList.Aux[
     CompileInputs2,
     Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
-      Vector[String] :*: VirtualFileRef :*: LNil
+      Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: LNil
   ] =
     LList.iso(
       { (v: CompileInputs2) =>
@@ -28,17 +29,19 @@ object CompileInputs2:
           ("scalacOptions", v.scalacOptions) :*:
           ("javacOptions", v.javacOptions) :*:
           ("outputPath", v.outputPath) :*:
+          ("cachePath", v.cachePath) :*:
           LNil
       },
       {
         (in: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
-          Vector[String] :*: VirtualFileRef :*: LNil) =>
+          Vector[String] :*: VirtualFileRef :*: VirtualFileRef :*: LNil) =>
           CompileInputs2(
             in.head,
             in.tail.head,
             in.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
           )
       }
     )