Skip to content

Commit 8b93438

Browse files
committed
Migrate to sbt slash syntax
1 parent a84c82c commit 8b93438

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

build.sbt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lazy val readme = scalatex.ScalatexReadme(
55
source = "Readme",
66
autoResources = List("out.js", "JProfiler.png")
77
).settings(
8-
(resources in Compile) += baseDirectory.value/".."/"out"/"demo"/"fullOpt"/"dest"/"out.js",
8+
(Compile / resources) += baseDirectory.value/".."/"out"/"demo"/"fullOpt"/"dest"/"out.js",
99
scalaVersion := Scala212
1010
)
1111

@@ -14,7 +14,7 @@ val Scala213 = "2.13.0"
1414

1515
lazy val root = project in file(".")
1616

17-
scalaVersion in ThisBuild := Scala213
17+
ThisBuild / scalaVersion := Scala213
1818

1919
lazy val commonTestSettings = libraryDependencies ++= Seq(
2020
"com.lihaoyi" %% "utest" % "0.7.0" cross CrossVersion.for3Use2_13,
@@ -25,19 +25,19 @@ lazy val commonTestSettings = libraryDependencies ++= Seq(
2525
lazy val fastparse = (project in file("fastparse"))
2626
.settings(
2727
name := "fastparse",
28-
fork in (Test, run) := true,
28+
fork := true,
2929

3030
libraryDependencies += "com.lihaoyi" %% "sourcecode" % "0.1.7" cross CrossVersion.for3Use2_13,
3131

32-
unmanagedSourceDirectories in Compile ++= {
32+
Compile / unmanagedSourceDirectories ++= {
3333
val base = baseDirectory.value
3434
Seq(base / "src", base / "src-jvm")
3535
},
3636

37-
unmanagedSourceDirectories in Test += baseDirectory.value / "test" / "src",
37+
Test / unmanagedSourceDirectories += baseDirectory.value / "test" / "src",
3838

39-
sourceGenerators in Compile += Def.task {
40-
val dir = (sourceManaged in Compile).value
39+
Compile / sourceGenerators += Def.task {
40+
val dir = (Compile / sourceManaged).value
4141
val file = dir/"fastparse"/"SequencerGen.scala"
4242
// Only go up to 21, because adding the last element makes it 22
4343
val tuples = (2 to 21).map{ i =>
@@ -72,10 +72,10 @@ lazy val fastparse = (project in file("fastparse"))
7272
lazy val cssparse = (project in file("cssparse"))
7373
.settings(
7474
name := "cssparse",
75-
fork in (Test, run) := true,
75+
fork := true,
7676
libraryDependencies += "net.sourceforge.cssparser" % "cssparser" % "0.9.18",
77-
scalaSource in Compile := baseDirectory.value / "src",
78-
unmanagedSourceDirectories in Test ++= {
77+
Compile / scalaSource := baseDirectory.value / "src",
78+
Test / unmanagedSourceDirectories ++= {
7979
val base = baseDirectory.value / "test"
8080
Seq(base / "src", base / "src-jvm")
8181
}
@@ -87,13 +87,13 @@ lazy val cssparse = (project in file("cssparse"))
8787
lazy val scalaparse = (project in file("scalaparse"))
8888
.settings(
8989
name := "scalaparse",
90-
fork in (Test, run) := true,
91-
scalaSource in Compile := baseDirectory.value / "src",
92-
unmanagedSourceDirectories in Test ++= {
90+
fork := true,
91+
Compile / scalaSource := baseDirectory.value / "src",
92+
Test / unmanagedSourceDirectories ++= {
9393
val base = baseDirectory.value / "test"
9494
Seq(base / "src", base / "src-jvm")
9595
},
96-
unmanagedResourceDirectories in Test += baseDirectory.value / "test" / "resources"
96+
Test / unmanagedResourceDirectories += baseDirectory.value / "test" / "resources"
9797
)
9898
.settings(commonTestSettings)
9999
.settings(dottySettings)
@@ -102,24 +102,24 @@ lazy val scalaparse = (project in file("scalaparse"))
102102
lazy val pythonparse = (project in file("pythonparse"))
103103
.settings(
104104
name := "pythonparse",
105-
fork in (Test, run) := true,
106-
scalaSource in Compile := baseDirectory.value / "src",
107-
unmanagedSourceDirectories in Test ++= {
105+
fork := true,
106+
Compile / scalaSource := baseDirectory.value / "src",
107+
Test / unmanagedSourceDirectories ++= {
108108
val base = baseDirectory.value / "test"
109109
Seq(base / "src", base / "src-jvm")
110110
},
111-
unmanagedResourceDirectories in Test += baseDirectory.value / "test" / "resources"
111+
Test / unmanagedResourceDirectories += baseDirectory.value / "test" / "resources"
112112
)
113113
.settings(commonTestSettings)
114114
.settings(dottySettings)
115115
.dependsOn(fastparse)
116116

117117
lazy val `perftests-common` =
118-
unmanagedResourceDirectories in Compile += (baseDirectory in LocalRootProject).value / "perftests" / "resources"
118+
Compile / unmanagedResourceDirectories += (LocalRootProject / baseDirectory).value / "perftests" / "resources"
119119

120120
lazy val `perftests-bench2` = (project in file("perftests/bench2"))
121121
.settings(
122-
scalaSource in Compile := baseDirectory.value / "src"
122+
Compile / scalaSource := baseDirectory.value / "src"
123123
)
124124
.settings(`perftests-common`)
125125
.settings(commonTestSettings)
@@ -133,7 +133,7 @@ lazy val `perftests-bench2` = (project in file("perftests/bench2"))
133133

134134
lazy val `perftests-compare` = (project in file("perftests/compare"))
135135
.settings(
136-
scalaSource in Compile := baseDirectory.value / "src",
136+
Compile / scalaSource := baseDirectory.value / "src",
137137
libraryDependencies ++= Seq(
138138
"org.json4s" %% "json4s-ast" % "3.6.7",
139139
"org.json4s" %% "json4s-native" % "3.6.7",

0 commit comments

Comments
 (0)