Convert to slash syntax

This commit is contained in:
Eugene Yokota 2022-08-13 22:16:40 -04:00
parent e8b2a198fb
commit 5939266233
2 changed files with 15 additions and 12 deletions

View File

@ -20,6 +20,9 @@ inThisBuild(List(
scalafixDependencies += "net.hamnaberg" %% "dataclass-scalafix" % dataclassScalafixV
))
Global / excludeLintKeys += scriptedBufferLog
Global / excludeLintKeys += scriptedLaunchOpts
val coursierVersion0 = "2.1.0-M6-49-gff26f8e39"
def dataclassGen(data: Reference) = Def.taskDyn {
@ -162,7 +165,7 @@ lazy val `sbt-coursier-shared-shaded` = project
.settings(
plugin,
generatePropertyFile,
unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`sbt-coursier-shared`).value
Compile / unmanagedSourceDirectories := (`sbt-coursier-shared` / Compile / unmanagedSourceDirectories).value
)
lazy val `sbt-lm-coursier` = project
@ -172,14 +175,14 @@ lazy val `sbt-lm-coursier` = project
.dependsOn(`sbt-coursier-shared-shaded`)
.settings(
plugin,
sbtTestDirectory := sbtTestDirectory.in(`sbt-coursier`).value,
sbtTestDirectory := (`sbt-coursier` / sbtTestDirectory).value,
scriptedDependencies := {
scriptedDependencies.value
// TODO Get those automatically
// (but shouldn't scripted itself handle that…?)
publishLocal.in(`lm-coursier-shaded`).value
publishLocal.in(`sbt-coursier-shared-shaded`).value
(`lm-coursier-shaded` / publishLocal).value
(`sbt-coursier-shared-shaded` / publishLocal).value
}
)
@ -195,8 +198,8 @@ lazy val `sbt-coursier` = project
// TODO Get dependency projects automatically
// (but shouldn't scripted itself handle that…?)
publishLocal.in(`lm-coursier`).value
publishLocal.in(`sbt-coursier-shared`).value
(`lm-coursier` / publishLocal).value
(`sbt-coursier-shared` / publishLocal).value
}
)
@ -246,6 +249,6 @@ lazy val `sbt-coursier-root` = project
)
.settings(
shared,
skip.in(publish) := true
(publish / skip) := true
)

View File

@ -48,8 +48,8 @@ object Settings {
val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT)
if (prop == "0" || prop == "false")
Seq(
sources in (Compile, doc) := Seq.empty,
publishArtifact in (Compile, packageDoc) := false
Compile / doc / sources := Seq.empty,
Compile / packageDoc / publishArtifact := false
)
else
Nil
@ -69,14 +69,14 @@ object Settings {
),
scriptedBufferLog := false,
sbtPlugin := true,
sbtVersion.in(pluginCrossBuild) := targetSbtVersion
pluginCrossBuild / sbtVersion := targetSbtVersion
)
lazy val generatePropertyFile =
resourceGenerators.in(Compile) += Def.task {
Compile / resourceGenerators += Def.task {
import sys.process._
val dir = classDirectory.in(Compile).value / "coursier"
val dir = (Compile / classDirectory).value / "coursier"
val ver = version.value
val f = dir / "sbtcoursier.properties"