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

Reformat some corner cases

This commit is contained in:
Dale Wijnand 2018-04-05 08:25:32 +01:00
parent 8f4b8abb7b
commit ebe5540226
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main-actions/src/main/scala/sbt/ForkTests.scala
View File

@ -87,15 +87,14 @@ private[sbt] object ForkTests {
val config = new ForkConfiguration(ConsoleAppender.formatEnabledInEnv, parallel) val config = new ForkConfiguration(ConsoleAppender.formatEnabledInEnv, parallel)
os.writeObject(config) os.writeObject(config)
val taskdefs = opts.tests.map( val taskdefs = opts.tests.map { t =>
t => new TaskDef(
new TaskDef( t.name,
t.name, forkFingerprint(t.fingerprint),
forkFingerprint(t.fingerprint), t.explicitlySpecified,
t.explicitlySpecified, t.selectors
t.selectors
) )
) }
os.writeObject(taskdefs.toArray) os.writeObject(taskdefs.toArray)
os.writeInt(runners.size) os.writeInt(runners.size)

6
main-actions/src/main/scala/sbt/Package.scala
View File

@ -67,11 +67,9 @@ object Package {
} }
setVersion(main) setVersion(main)
type Inputs = Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil
val cachedMakeJar = inputChanged(cacheStoreFactory make "inputs") { val cachedMakeJar = inputChanged(cacheStoreFactory make "inputs") {
( (inChanged, inputs: Inputs) =>
inChanged,
inputs: Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil
) =>
import exists.format import exists.format
val sources :+: _ :+: manifest :+: HNil = inputs val sources :+: _ :+: manifest :+: HNil = inputs
inputChanged(cacheStoreFactory make "output") { (outChanged, jar: PlainFileInfo) => inputChanged(cacheStoreFactory make "output") { (outChanged, jar: PlainFileInfo) =>

5
main-actions/src/main/scala/sbt/RawCompileLike.scala
View File

@ -54,9 +54,8 @@ object RawCompileLike {
): Gen = ): Gen =
(sources, classpath, outputDirectory, options, maxErrors, log) => { (sources, classpath, outputDirectory, options, maxErrors, log) => {
type Inputs = type Inputs =
FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: Seq[File] :+: File :+: Seq[ FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: Seq[File] :+: File :+:
String Seq[String] :+: Int :+: HNil
] :+: Int :+: HNil
val inputs val inputs
: Inputs = hash(sources.toSet ++ optionFiles(options, fileInputOpts)) :+: lastModified( : Inputs = hash(sources.toSet ++ optionFiles(options, fileInputOpts)) :+: lastModified(
classpath.toSet classpath.toSet