From 1e2bbb2c0bc7c9ba4bb626d4e45a5ab8519ec751 Mon Sep 17 00:00:00 2001 From: Guillaume Massé Date: Wed, 21 Sep 2016 14:00:23 -0400 Subject: delegate compilation info to sbt reporter --- project/Build.scala | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'project') diff --git a/project/Build.scala b/project/Build.scala index e32e3bbd6..ec2db8339 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -208,27 +208,30 @@ object DottyBuild extends Build { settings(publishing) // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402) - lazy val cleanBridge = TaskKey[Unit]("clean-sbt-bridge", "delete dotty-sbt-bridge cache") + lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache") lazy val `dotty-bridge` = project.in(file("bridge")). dependsOn(dotty). settings( overrideScalaVersionSetting, - cleanBridge := { + cleanSbtBridge := { val dottyBridgeVersion = version.value val dottyVersion = (version in dotty).value val classVersion = System.getProperty("java.class.version") + val sbtV = sbtVersion.value + val sbtOrg = "org.scala-sbt" + val sbtScalaVersion = "2.10.6" + val home = System.getProperty("user.home") val org = organization.value val artifact = moduleName.value - IO.delete(file(home) / ".ivy2" / "cache" / "org.scala-sbt" / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion") - IO.delete(file(home) / ".sbt" / "boot" / "scala-2.10.6" / "org.scala-sbt" / "sbt" / sbtV / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion") + IO.delete(file(home) / ".ivy2" / "cache" / sbtOrg / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion") + IO.delete(file(home) / ".sbt" / "boot" / s"scala-$sbtScalaVersion" / sbtOrg / "sbt" / sbtV / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion") }, - publishLocal <<= publishLocal.dependsOn(cleanBridge), - + publishLocal := (publishLocal.dependsOn(cleanSbtBridge)).value, description := "sbt compiler bridge for Dotty", resolvers += Resolver.typesafeIvyRepo("releases"), libraryDependencies ++= Seq( -- cgit v1.2.3