Skip to content

Commit 52fe31c

Browse files
committed
Fix after rebase
1 parent 2246a45 commit 52fe31c

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
@@ -224,7 +224,7 @@ object Build {
224224
options: BuildOptions,
225225
logger: Logger
226226
)(using ScalaCliInvokeData) =
227-
CrossSources.forInputs(
227+
CrossSources.forModuleInputs(
228228
inputs,
229229
Sources.defaultPreprocessors(
230230
options.archiveCache,
@@ -238,7 +238,8 @@ object Build {
238238

239239
private def build(
240240
inputs: Module,
241-
crossSources: CrossSources,options: BuildOptions,
241+
crossSources: CrossSources,
242+
options: BuildOptions,
242243
logger: Logger,
243244
buildClient: BloopBuildClient,
244245
compiler: ScalaCompiler,
@@ -280,12 +281,12 @@ object Build {
280281

281282
val baseOptions = overrideOptions.orElse(sharedOptions)
282283

283-
val inputs0 = if (allInputs.mayAppendHash) {
284+
val inputs0 = if (inputs.mayAppendHash) {
284285
updateInputs(
285286
inputs,
286287
overrideOptions.orElse(options) // update hash in inputs with options coming from the CLI or cross-building, not from the sources
287288
)
288-
} else allInputs
289+
} else inputs
289290

290291
val scopedSources = value(crossSources.scopedSources(baseOptions))
291292

project/deps.sc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ object Deps {
232232
def svm = ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
233233
def swoval = ivy"com.swoval:file-tree-views:2.1.12"
234234
def testInterface = ivy"org.scala-sbt:test-interface:1.0"
235+
def tomlScala = ivy"tech.sparse:toml-scala_2.13:0.2.2"
235236
val toolkitVersion = "0.5.0"
236237
val toolkitVersionForNative04 = "0.3.0"
237238
val toolkitVersionForNative05 = toolkitVersion

0 commit comments

Comments
 (0)