Skip to content

Commit aef6f96

Browse files
Working project build with new sbt version
1 parent 5f1810a commit aef6f96

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ src_managed
1010
*.iml
1111
.vscode
1212
.metals
13+
.bsp

project/common.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import sbt._
33
object Common {
44
import Keys._
55

6-
val defaultScalaVersion = "2.13.1"
6+
val defaultScalaVersion = "2.13.14"
77

88
val testSettings:Seq[Setting[_]] = Seq(
9-
testOptions in Test += Tests.Cleanup { loader =>
9+
Test / testOptions += Tests.Cleanup { loader =>
1010
val c = loader.loadClass("unfiltered.spec.Cleanup$")
1111
c.getMethod("cleanup").invoke(c.getField("MODULE$").get(c))
1212
},
13-
testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
13+
Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
1414
)
1515

1616
val settings: Seq[Setting[_]] = Seq(
@@ -20,7 +20,7 @@ object Common {
2020

2121
scalaVersion := defaultScalaVersion,
2222

23-
scalacOptions in (Compile) ++= Seq(
23+
Compile / scalacOptions ++= Seq(
2424
"-deprecation",
2525
"-feature",
2626
"-unchecked",
@@ -33,7 +33,7 @@ object Common {
3333
"-Ywarn-value-discard"
3434
),
3535

36-
scalacOptions in (Compile) ++= {
36+
Compile / scalacOptions ++= {
3737
CrossVersion.partialVersion(scalaVersion.value) match {
3838
case Some((2, v)) if v <= 12 =>
3939
Seq("-Yno-adapted-args", "-Xfuture")
@@ -42,7 +42,7 @@ object Common {
4242
}
4343
},
4444

45-
scalacOptions in (Test) ~= { (opts: Seq[String]) =>
45+
Test / scalacOptions ~= { (opts: Seq[String]) =>
4646
opts.diff(
4747
Seq(
4848
"-Xlint"
@@ -65,7 +65,7 @@ object Common {
6565
Some("releases" at nexus + "service/local/staging/deploy/maven2")
6666
},
6767

68-
publishArtifact in Test := false,
68+
Test / publishArtifact := false,
6969

7070
licenses := Seq("LGPL v3" -> url("http://www.gnu.org/licenses/lgpl.txt")),
7171

0 commit comments

Comments
 (0)