@@ -276,22 +276,21 @@ object DottyBuild extends Build {
276
276
// Override run to be able to run compiled classfiles
277
277
dotr := {
278
278
val args : Seq [String ] = spaceDelimited(" <arg>" ).parsed
279
- val java : String = Process (" which" :: " java" :: Nil ) !!
280
- val scalaLib = (dependencyClasspath in Runtime , packageAll)
281
- .map { (attList, _) =>
282
- attList
283
- .map(_.data.getAbsolutePath)
284
- .find(_.contains(" scala-library" ))
285
- .toList.mkString(" :" )
286
- }.value
279
+ val java : String = Process (" which" :: " java" :: Nil ).!!
280
+ val attList = (dependencyClasspath in Runtime ).value
281
+ val _ = packageAll.value
282
+ val scalaLib = attList
283
+ .map(_.data.getAbsolutePath)
284
+ .find(_.contains(" scala-library" ))
285
+ .toList.mkString(" :" )
287
286
288
287
if (java == " " )
289
288
println(" Couldn't find java executable on path, please install java to a default location" )
290
289
else if (scalaLib == " " ) {
291
290
println(" Couldn't find scala-library on classpath, please run using script in bin dir instead" )
292
291
} else {
293
292
val dottyLib = packageAll.value(" dotty-library" )
294
- s """ $java -classpath .: $dottyLib: $scalaLib ${args.mkString(" " )}""" !
293
+ s """ $java -classpath .: $dottyLib: $scalaLib ${args.mkString(" " )}""" . !
295
294
}
296
295
},
297
296
run := Def .inputTaskDyn {
@@ -327,7 +326,7 @@ object DottyBuild extends Build {
327
326
partestLockFile.createNewFile
328
327
partestLockFile.deleteOnExit
329
328
},
330
- runPartestRunner << = Def .inputTaskDyn {
329
+ runPartestRunner : = Def .inputTaskDyn {
331
330
// Magic! This is both an input task and a dynamic task. Apparently
332
331
// command line arguments get passed to the last task in an aliased
333
332
// sequence (see partest alias below), so this works.
@@ -341,7 +340,7 @@ object DottyBuild extends Build {
341
340
s """ -dottyJars ${jars.length + 2 } dotty.jar dotty-lib.jar ${jars.mkString(" " )}"""
342
341
// Provide the jars required on the classpath of run tests
343
342
runTask(Test , " dotty.partest.DPConsoleRunner" , dottyJars + " " + args.mkString(" " ))
344
- },
343
+ }.evaluated ,
345
344
346
345
/* Add the sources of scalajs-ir.
347
346
* To guarantee that dotty can bootstrap without depending on a version
@@ -386,7 +385,10 @@ object DottyBuild extends Build {
386
385
387
386
// http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
388
387
// packageAll should always be run before tests
389
- javaOptions <++= (dependencyClasspath in Runtime , packageAll) map { (attList, pA) =>
388
+ javaOptions ++= {
389
+ val attList = (dependencyClasspath in Runtime ).value
390
+ val pA = packageAll.value
391
+
390
392
// put needed dependencies on classpath:
391
393
val path = for {
392
394
file <- attList.map(_.data)
@@ -632,7 +634,7 @@ object DottyInjectedPlugin extends AutoPlugin {
632
634
/* Make sure jsDependencyManifest runs after compile, otherwise compile
633
635
* might remove the entire directory afterwards.
634
636
*/
635
- jsDependencyManifest << = jsDependencyManifest.dependsOn(compile)
637
+ jsDependencyManifest : = jsDependencyManifest.dependsOn(compile).value
636
638
)))
637
639
638
640
lazy val `dotty-bench` = project.in(file(" bench" )).
@@ -652,7 +654,10 @@ object DottyInjectedPlugin extends AutoPlugin {
652
654
parallelExecution in Test := false ,
653
655
654
656
// http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
655
- javaOptions <++= (dependencyClasspath in Runtime , packageBin in Compile ) map { (attList, bin) =>
657
+ javaOptions ++= {
658
+ val attList = (dependencyClasspath in Runtime ).value
659
+ val bin = (packageBin in Compile ).value
660
+
656
661
// put the Scala {library, reflect, compiler} in the classpath
657
662
val path = for {
658
663
file <- attList.map(_.data)
0 commit comments