Skip to content

Commit fbcd98f

Browse files
committed
in the build, use slash syntax everywhere
1 parent 0eb0f57 commit fbcd98f

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

build.sbt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
6666
name := "scala-collection-compat",
6767
moduleName := "scala-collection-compat",
6868
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
69-
unmanagedSourceDirectories in Compile += {
70-
val sharedSourceDir = (baseDirectory in ThisBuild).value / "compat/src/main"
69+
Compile / unmanagedSourceDirectories += {
70+
val sharedSourceDir = (ThisBuild / baseDirectory).value / "compat/src/main"
7171
if (scalaVersion.value.startsWith("2.13.")) sharedSourceDir / "scala-2.13"
7272
else sharedSourceDir / "scala-2.11_2.12"
7373
},
@@ -78,14 +78,14 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
7878
)
7979
.jsSettings(
8080
scalacOptions += {
81-
val x = (baseDirectory in LocalRootProject).value.toURI.toString
81+
val x = (LocalRootProject / baseDirectory).value.toURI.toString
8282
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
8383
.Process("git rev-parse HEAD")
8484
.lineStream_!
8585
.head
8686
s"-P:scalajs:mapSourceURI:$x->$y/"
8787
},
88-
fork in Test := false // Scala.js cannot run forked tests
88+
Test / fork := false // Scala.js cannot run forked tests
8989
)
9090
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
9191
.disablePlugins(ScalafixPlugin)
@@ -131,13 +131,13 @@ lazy val `binary-compat` = project
131131
junit,
132132
buildInfoPackage := "build",
133133
buildInfoKeys := Seq[BuildInfoKey](
134-
"oldClasses" -> (classDirectory in (`binary-compat-old`, Compile)).value.toString,
135-
"newClasses" -> (classDirectory in (`binary-compat-new`, Compile)).value.toString
134+
"oldClasses" -> (`binary-compat-old` / Compile / classDirectory).value.toString,
135+
"newClasses" -> (`binary-compat-new` / Compile / classDirectory).value.toString
136136
),
137-
test in Test := (test in Test)
137+
Test / test := (Test / test)
138138
.dependsOn(
139-
compile in (`binary-compat-old`, Compile),
140-
compile in (`binary-compat-new`, Compile)
139+
`binary-compat-old` / Compile / compile,
140+
`binary-compat-new` / Compile / compile,
141141
)
142142
.value
143143
)
@@ -149,8 +149,8 @@ lazy val `scalafix-rules` = project
149149
.settings(scalaModuleSettings)
150150
.settings(commonSettings)
151151
.settings(
152-
organization := (organization in compat212JVM).value,
153-
publishTo := (publishTo in compat212JVM).value,
152+
organization := (compat212JVM / organization).value,
153+
publishTo := (compat212JVM / publishTo).value,
154154
name := "scala-collection-migrations",
155155
scalaVersion := scalafixScala212,
156156
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion
@@ -205,19 +205,19 @@ val `scalafix-output` = MultiScalaProject(
205205
)
206206

207207
lazy val outputCross =
208-
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output/src/main/scala")
208+
Def.setting((ThisBuild / baseDirectory).value / "scalafix/output/src/main/scala")
209209

210210
lazy val output212 =
211-
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212/src/main/scala")
212-
lazy val addOutput212 = unmanagedSourceDirectories in Compile += output212.value
211+
Def.setting((ThisBuild / baseDirectory).value / "scalafix/output212/src/main/scala")
212+
lazy val addOutput212 = Compile / unmanagedSourceDirectories += output212.value
213213

214214
lazy val output212Plus =
215-
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212+/src/main/scala")
216-
lazy val addOutput212Plus = unmanagedSourceDirectories in Compile += output212Plus.value
215+
Def.setting((ThisBuild / baseDirectory).value / "scalafix/output212+/src/main/scala")
216+
lazy val addOutput212Plus = Compile / unmanagedSourceDirectories += output212Plus.value
217217

218218
lazy val output213 =
219-
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output213/src/main/scala")
220-
lazy val addOutput213 = unmanagedSourceDirectories in Compile += output213.value
219+
Def.setting((ThisBuild / baseDirectory).value / "scalafix/output213/src/main/scala")
220+
lazy val addOutput213 = Compile / unmanagedSourceDirectories += output213.value
221221

222222
lazy val `scalafix-output211` = `scalafix-output`(
223223
scala211,

project/MultiScalaProject.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ trait MultiScala {
3636

3737
def srcFull(base: String): Seq[Def.Setting[_]] = {
3838
Seq(
39-
unmanagedSourceDirectories in Compile +=
40-
(baseDirectory in ThisBuild).value / base / "src" / "main" / "scala",
41-
unmanagedSourceDirectories in Compile +=
42-
(baseDirectory in ThisBuild).value / base / "src" / "main" / ("scala-" + scalaBinaryVersion.value),
43-
unmanagedSourceDirectories in Compile ++= {
44-
val sourceDir = (baseDirectory in ThisBuild).value / base / "src" / "main"
39+
Compile / unmanagedSourceDirectories +=
40+
(ThisBuild / baseDirectory).value / base / "src" / "main" / "scala",
41+
Compile / unmanagedSourceDirectories +=
42+
(ThisBuild / baseDirectory).value / base / "src" / "main" / ("scala-" + scalaBinaryVersion.value),
43+
Compile / unmanagedSourceDirectories ++= {
44+
val sourceDir = (ThisBuild / baseDirectory).value / base / "src" / "main"
4545
CrossVersion.partialVersion(scalaVersion.value) match {
4646
case Some((2, n)) if n >= 12 => List(sourceDir / "scala-2.12+")
4747
case _ => Nil
4848
}
4949
},
50-
unmanagedSourceDirectories in Test +=
51-
(baseDirectory in ThisBuild).value / base / "src" / "test" / "scala",
52-
unmanagedResourceDirectories in Compile +=
53-
(baseDirectory in ThisBuild).value / base / "src" / "main" / "resources",
54-
unmanagedResourceDirectories in Test +=
55-
(baseDirectory in ThisBuild).value / base / "src" / "test" / "resources"
50+
Test / unmanagedSourceDirectories +=
51+
(ThisBuild / baseDirectory).value / base / "src" / "test" / "scala",
52+
Compile / unmanagedResourceDirectories +=
53+
(ThisBuild / baseDirectory).value / base / "src" / "main" / "resources",
54+
Test / unmanagedResourceDirectories +=
55+
(ThisBuild / baseDirectory).value / base / "src" / "test" / "resources"
5656
)
5757
}
5858
}

0 commit comments

Comments
 (0)