Fix after rebase

MaciejG604 · Aug 20, 2024 · 52fe31c · 52fe31c
1 parent 2246a45
commit 52fe31c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/modules/build/src/main/scala/scala/build/Build.scala b/modules/build/src/main/scala/scala/build/Build.scala
@@ -224,7 +224,7 @@ object Build {
     options: BuildOptions,
     logger: Logger
   )(using ScalaCliInvokeData) =
-    CrossSources.forInputs(
+    CrossSources.forModuleInputs(
       inputs,
       Sources.defaultPreprocessors(
         options.archiveCache,
@@ -238,7 +238,8 @@ object Build {
 
   private def build(
     inputs: Module,
-    crossSources: CrossSources,options: BuildOptions,
+    crossSources: CrossSources,
+    options: BuildOptions,
     logger: Logger,
     buildClient: BloopBuildClient,
     compiler: ScalaCompiler,
@@ -280,12 +281,12 @@ object Build {
 
       val baseOptions = overrideOptions.orElse(sharedOptions)
 
-      val inputs0 = if (allInputs.mayAppendHash) {
+      val inputs0 = if (inputs.mayAppendHash) {
         updateInputs(
           inputs,
           overrideOptions.orElse(options) // update hash in inputs with options coming from the CLI or cross-building, not from the sources
         )
-      } else allInputs
+      } else inputs
 
       val scopedSources = value(crossSources.scopedSources(baseOptions))
 

diff --git a/project/deps.sc b/project/deps.sc
@@ -232,6 +232,7 @@ object Deps {
   def svm                       = ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
   def swoval                    = ivy"com.swoval:file-tree-views:2.1.12"
   def testInterface             = ivy"org.scala-sbt:test-interface:1.0"
+  def tomlScala                 = ivy"tech.sparse:toml-scala_2.13:0.2.2"
   val toolkitVersion            = "0.5.0"
   val toolkitVersionForNative04 = "0.3.0"
   val toolkitVersionForNative05 = toolkitVersion