Skip to content

Commit 0d7f05f

Browse files
committed
Fix after rebase
1 parent c21320e commit 0d7f05f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ object Build {
219219
options: BuildOptions,
220220
logger: Logger
221221
)(using ScalaCliInvokeData) =
222-
CrossSources.forInputs(
222+
CrossSources.forModuleInputs(
223223
inputs,
224224
Sources.defaultPreprocessors(
225225
options.archiveCache,
@@ -233,7 +233,8 @@ object Build {
233233

234234
private def build(
235235
inputs: Module,
236-
crossSources: CrossSources,options: BuildOptions,
236+
crossSources: CrossSources,
237+
options: BuildOptions,
237238
logger: Logger,
238239
buildClient: BloopBuildClient,
239240
compiler: ScalaCompiler,
@@ -275,12 +276,12 @@ object Build {
275276

276277
val baseOptions = overrideOptions.orElse(sharedOptions)
277278

278-
val inputs0 = if (allInputs.mayAppendHash) {
279+
val inputs0 = if (inputs.mayAppendHash) {
279280
updateInputs(
280281
inputs,
281282
overrideOptions.orElse(options) // update hash in inputs with options coming from the CLI or cross-building, not from the sources
282283
)
283-
} else allInputs
284+
} else inputs
284285

285286
val scopedSources = value(crossSources.scopedSources(baseOptions))
286287

project/deps.sc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ object Deps {
210210
def svm = ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
211211
def swoval = ivy"com.swoval:file-tree-views:2.1.12"
212212
def testInterface = ivy"org.scala-sbt:test-interface:1.0"
213+
def tomlScala = ivy"tech.sparse:toml-scala_2.13:0.2.2"
213214
val toolkitVersion = "0.4.0"
214215
val toolkitVersionForNative04 = "0.3.0"
215216
val toolkitVersionForNative05 = toolkitVersion

0 commit comments

Comments
 (0)