@@ -288,22 +288,21 @@ object DottyBuild extends Build {
288288 // Override run to be able to run compiled classfiles
289289 dotr := {
290290 val args : Seq [String ] = spaceDelimited(" <arg>" ).parsed
291- val java : String = Process (" which" :: " java" :: Nil ) !!
292- val scalaLib = (dependencyClasspath in Runtime , packageAll)
293- .map { (attList, _) =>
294- attList
295- .map(_.data.getAbsolutePath)
296- .find(_.contains(" scala-library" ))
297- .toList.mkString(" :" )
298- }.value
291+ val java : String = Process (" which" :: " java" :: Nil ).!!
292+ val attList = (dependencyClasspath in Runtime ).value
293+ val _ = packageAll.value
294+ val scalaLib = attList
295+ .map(_.data.getAbsolutePath)
296+ .find(_.contains(" scala-library" ))
297+ .toList.mkString(" :" )
299298
300299 if (java == " " )
301300 println(" Couldn't find java executable on path, please install java to a default location" )
302301 else if (scalaLib == " " ) {
303302 println(" Couldn't find scala-library on classpath, please run using script in bin dir instead" )
304303 } else {
305304 val dottyLib = packageAll.value(" dotty-library" )
306- s """ $java -classpath .: $dottyLib: $scalaLib ${args.mkString(" " )}""" !
305+ s """ $java -classpath .: $dottyLib: $scalaLib ${args.mkString(" " )}""" . !
307306 }
308307 },
309308 run := Def .inputTaskDyn {
@@ -339,7 +338,7 @@ object DottyBuild extends Build {
339338 partestLockFile.createNewFile
340339 partestLockFile.deleteOnExit
341340 },
342- runPartestRunner << = Def .inputTaskDyn {
341+ runPartestRunner : = Def .inputTaskDyn {
343342 // Magic! This is both an input task and a dynamic task. Apparently
344343 // command line arguments get passed to the last task in an aliased
345344 // sequence (see partest alias below), so this works.
@@ -353,7 +352,7 @@ object DottyBuild extends Build {
353352 s """ -dottyJars ${jars.length + 2 } dotty.jar dotty-lib.jar ${jars.mkString(" " )}"""
354353 // Provide the jars required on the classpath of run tests
355354 runTask(Test , " dotty.partest.DPConsoleRunner" , dottyJars + " " + args.mkString(" " ))
356- },
355+ }.evaluated ,
357356
358357 /* Add the sources of scalajs-ir.
359358 * To guarantee that dotty can bootstrap without depending on a version
@@ -398,7 +397,10 @@ object DottyBuild extends Build {
398397
399398 // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
400399 // packageAll should always be run before tests
401- javaOptions <++= (dependencyClasspath in Runtime , packageAll) map { (attList, pA) =>
400+ javaOptions ++= {
401+ val attList = (dependencyClasspath in Runtime ).value
402+ val pA = packageAll.value
403+
402404 // put needed dependencies on classpath:
403405 val path = for {
404406 file <- attList.map(_.data)
@@ -644,7 +646,7 @@ object DottyInjectedPlugin extends AutoPlugin {
644646 /* Make sure jsDependencyManifest runs after compile, otherwise compile
645647 * might remove the entire directory afterwards.
646648 */
647- jsDependencyManifest << = jsDependencyManifest.dependsOn(compile)
649+ jsDependencyManifest : = jsDependencyManifest.dependsOn(compile).value
648650 )))
649651
650652 lazy val `dotty-bench` = project.in(file(" bench" )).
@@ -664,7 +666,10 @@ object DottyInjectedPlugin extends AutoPlugin {
664666 parallelExecution in Test := false ,
665667
666668 // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
667- javaOptions <++= (dependencyClasspath in Runtime , packageBin in Compile ) map { (attList, bin) =>
669+ javaOptions ++= {
670+ val attList = (dependencyClasspath in Runtime ).value
671+ val bin = (packageBin in Compile ).value
672+
668673 // put the Scala {library, reflect, compiler} in the classpath
669674 val path = for {
670675 file <- attList.map(_.data)
0 commit comments