diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-02-22 22:45:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-22 22:45:33 +0100 |
commit | a0f47a00131935d85f957a80d0c4472eaa7b5baa (patch) | |
tree | 15b619d1986bc9e5e0cffd5e970cf5d60c5ddd90 /project | |
parent | 501db6636481c31b586ffc5a1bfd0095f76709c7 (diff) | |
parent | d5fad4559fff6f591bb5ec1f9a89d58f0898f39e (diff) | |
download | dotty-a0f47a00131935d85f957a80d0c4472eaa7b5baa.tar.gz dotty-a0f47a00131935d85f957a80d0c4472eaa7b5baa.tar.bz2 dotty-a0f47a00131935d85f957a80d0c4472eaa7b5baa.zip |
Merge pull request #2022 from dotty-staging/fix/sbt-warnings
Fix warnings in sbt build
Diffstat (limited to 'project')
-rw-r--r-- | project/Build.scala | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/project/Build.scala b/project/Build.scala index 08b1b4f4e..376e06bb1 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -288,14 +288,13 @@ object DottyBuild extends Build { // Override run to be able to run compiled classfiles dotr := { val args: Seq[String] = spaceDelimited("<arg>").parsed - val java: String = Process("which" :: "java" :: Nil) !! - val scalaLib = (dependencyClasspath in Runtime, packageAll) - .map { (attList, _) => - attList - .map(_.data.getAbsolutePath) - .find(_.contains("scala-library")) - .toList.mkString(":") - }.value + val java: String = Process("which" :: "java" :: Nil).!! + val attList = (dependencyClasspath in Runtime).value + val _ = packageAll.value + val scalaLib = attList + .map(_.data.getAbsolutePath) + .find(_.contains("scala-library")) + .toList.mkString(":") if (java == "") println("Couldn't find java executable on path, please install java to a default location") @@ -303,7 +302,7 @@ object DottyBuild extends Build { println("Couldn't find scala-library on classpath, please run using script in bin dir instead") } else { val dottyLib = packageAll.value("dotty-library") - s"""$java -classpath .:$dottyLib:$scalaLib ${args.mkString(" ")}""" ! + s"""$java -classpath .:$dottyLib:$scalaLib ${args.mkString(" ")}""".! } }, run := Def.inputTaskDyn { @@ -339,7 +338,7 @@ object DottyBuild extends Build { partestLockFile.createNewFile partestLockFile.deleteOnExit }, - runPartestRunner <<= Def.inputTaskDyn { + runPartestRunner := Def.inputTaskDyn { // Magic! This is both an input task and a dynamic task. Apparently // command line arguments get passed to the last task in an aliased // sequence (see partest alias below), so this works. @@ -353,7 +352,7 @@ object DottyBuild extends Build { s"""-dottyJars ${jars.length + 2} dotty.jar dotty-lib.jar ${jars.mkString(" ")}""" // Provide the jars required on the classpath of run tests runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" ")) - }, + }.evaluated, /* Add the sources of scalajs-ir. * To guarantee that dotty can bootstrap without depending on a version @@ -398,7 +397,10 @@ object DottyBuild extends Build { // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala // packageAll should always be run before tests - javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, pA) => + javaOptions ++= { + val attList = (dependencyClasspath in Runtime).value + val pA = packageAll.value + // put needed dependencies on classpath: val path = for { file <- attList.map(_.data) @@ -644,7 +646,7 @@ object DottyInjectedPlugin extends AutoPlugin { /* Make sure jsDependencyManifest runs after compile, otherwise compile * might remove the entire directory afterwards. */ - jsDependencyManifest <<= jsDependencyManifest.dependsOn(compile) + jsDependencyManifest := jsDependencyManifest.dependsOn(compile).value ))) lazy val `dotty-bench` = project.in(file("bench")). @@ -664,7 +666,10 @@ object DottyInjectedPlugin extends AutoPlugin { parallelExecution in Test := false, // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala - javaOptions <++= (dependencyClasspath in Runtime, packageBin in Compile) map { (attList, bin) => + javaOptions ++= { + val attList = (dependencyClasspath in Runtime).value + val bin = (packageBin in Compile).value + // put the Scala {library, reflect, compiler} in the classpath val path = for { file <- attList.map(_.data) |