Skip to content

Commit dcc87e5

Browse files
authored
Merge pull request #346 from xuwei-k/slash-syntax
use new slash syntax instead of deprecated `in`
2 parents 150214c + cff5d7c commit dcc87e5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

sbt-conscript/src/main/scala/ConscriptPlugin.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ object ConscriptPlugin extends AutoPlugin {
1818
List(
1919
csSbtLauncherVersion := ConscriptBuildInfo.sbtLauncherVersion,
2020
libraryDependencies += "org.scala-sbt" % "launcher-interface" % csSbtLauncherVersion.value % "provided",
21-
sourceDirectory in csRun := { (sourceDirectory in Compile).value / conscriptStr },
22-
target in csRun := { target.value / conscriptStr },
23-
csBoot := { (target in csRun).value / "boot" },
21+
csRun / sourceDirectory := { (Compile / sourceDirectory).value / conscriptStr },
22+
csRun / target := { target.value / conscriptStr },
23+
csBoot := { (csRun / target).value / "boot" },
2424
csWrite := csWriteTask.value,
2525
csRun := csRunTask.evaluated,
26-
(aggregate in csRun) := false
26+
(csRun / aggregate) := false
2727
)
2828

2929
private def configs(path: File) = (path ** "launchconfig").get
3030
private def configName(path: File) = file(path.getParent).getName
3131
lazy val csWriteTask = Def.task {
32-
val base = (sourceDirectory in csRun).value
33-
val output = (target in csRun).value
32+
val base = (csRun / sourceDirectory).value
33+
val output = (csRun / target).value
3434
val boot = csBoot.value
3535
IO.delete(output)
3636
IO.copyDirectory(base, output)
@@ -52,7 +52,7 @@ object ConscriptPlugin extends AutoPlugin {
5252
val args = Def.spaceDelimited().parsed
5353
val x = csWrite.value
5454
val y = publishLocal.value
55-
val output = (target in csRun).value
55+
val output = (csRun / target).value
5656
val config = args.headOption.map { name =>
5757
configs(output).find {
5858
p => configName(p) == name

0 commit comments

Comments
 (0)