diff --git a/sbt-conscript/src/main/scala/ConscriptPlugin.scala b/sbt-conscript/src/main/scala/ConscriptPlugin.scala index e2e3a70..5174fe8 100644 --- a/sbt-conscript/src/main/scala/ConscriptPlugin.scala +++ b/sbt-conscript/src/main/scala/ConscriptPlugin.scala @@ -18,19 +18,19 @@ object ConscriptPlugin extends AutoPlugin { List( csSbtLauncherVersion := ConscriptBuildInfo.sbtLauncherVersion, libraryDependencies += "org.scala-sbt" % "launcher-interface" % csSbtLauncherVersion.value % "provided", - sourceDirectory in csRun := { (sourceDirectory in Compile).value / conscriptStr }, - target in csRun := { target.value / conscriptStr }, - csBoot := { (target in csRun).value / "boot" }, + csRun / sourceDirectory := { (Compile / sourceDirectory).value / conscriptStr }, + csRun / target := { target.value / conscriptStr }, + csBoot := { (csRun / target).value / "boot" }, csWrite := csWriteTask.value, csRun := csRunTask.evaluated, - (aggregate in csRun) := false + (csRun / aggregate) := false ) private def configs(path: File) = (path ** "launchconfig").get private def configName(path: File) = file(path.getParent).getName lazy val csWriteTask = Def.task { - val base = (sourceDirectory in csRun).value - val output = (target in csRun).value + val base = (csRun / sourceDirectory).value + val output = (csRun / target).value val boot = csBoot.value IO.delete(output) IO.copyDirectory(base, output) @@ -52,7 +52,7 @@ object ConscriptPlugin extends AutoPlugin { val args = Def.spaceDelimited().parsed val x = csWrite.value val y = publishLocal.value - val output = (target in csRun).value + val output = (csRun / target).value val config = args.headOption.map { name => configs(output).find { p => configName(p) == name