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