Skip to content

Commit eca283c

Browse files
Update scalatest to 3.2.16 (#371)
1 parent dfc275f commit eca283c

File tree

1 file changed

+35
-31
lines changed

1 file changed

+35
-31
lines changed

build.sbt

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
11
name := "overflowdb"
2-
ThisBuild/organization := "io.shiftleft"
3-
ThisBuild/scalaVersion := "2.13.10"
4-
ThisBuild/crossScalaVersions := Seq("2.13.10", "3.2.2")
2+
ThisBuild / organization := "io.shiftleft"
3+
ThisBuild / scalaVersion := "2.13.10"
4+
ThisBuild / crossScalaVersions := Seq("2.13.10", "3.2.2")
55
// TODO once we're on Scala 3.2.2: make chained implicits in `Implicits.scala` available again
66
// also, change other places that have temporarily been adapted - search for `TODO Scala 3.2.2`
7-
publish/skip := true
7+
publish / skip := true
88

9-
lazy val core = project.in(file("core"))
9+
lazy val core = project.in(file("core"))
1010
lazy val testdomains = project.in(file("testdomains")).dependsOn(core)
11-
lazy val traversal = project.in(file("traversal" )).dependsOn(core)
12-
lazy val formats = project.in(file("formats" )).dependsOn(traversal, testdomains % Test)
13-
lazy val coreTests = project.in(file("core-tests" )).dependsOn(formats, testdomains)
14-
lazy val traversalTests = project.in(file("traversal-tests" )).dependsOn(formats)
11+
lazy val traversal = project.in(file("traversal")).dependsOn(core)
12+
lazy val formats = project.in(file("formats")).dependsOn(traversal, testdomains % Test)
13+
lazy val coreTests = project.in(file("core-tests")).dependsOn(formats, testdomains)
14+
lazy val traversalTests = project.in(file("traversal-tests")).dependsOn(formats)
1515

16-
ThisBuild/libraryDependencies ++= Seq(
16+
ThisBuild / libraryDependencies ++= Seq(
1717
"org.slf4j" % "slf4j-simple" % "2.0.7" % Test,
18-
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
18+
"org.scalatest" %% "scalatest" % "3.2.16" % Test
1919
)
2020

21-
ThisBuild/scalacOptions ++= Seq(
22-
"-release", "8",
21+
ThisBuild / scalacOptions ++= Seq(
22+
"-release",
23+
"8",
2324
"-deprecation",
2425
"-feature"
2526
)
2627

2728
ThisBuild / compile / javacOptions ++= Seq(
28-
"-g", //debug symbols
29-
"--release", "8"
29+
"-g", // debug symbols
30+
"--release",
31+
"8"
3032
)
3133

32-
ThisBuild/Test/testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v")
33-
ThisBuild/Test/fork := true
34+
ThisBuild / Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v")
35+
ThisBuild / Test / fork := true
3436

35-
ThisBuild/resolvers ++= Seq(
37+
ThisBuild / resolvers ++= Seq(
3638
Resolver.mavenLocal,
37-
"Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public")
39+
"Sonatype OSS".at("https://oss.sonatype.org/content/repositories/public")
40+
)
3841

39-
ThisBuild/Compile/scalacOptions ++= Seq(
40-
"-language:implicitConversions",
42+
ThisBuild / Compile / scalacOptions ++= Seq(
43+
"-language:implicitConversions"
4144
// "-language:existentials",
4245
)
4346

44-
ThisBuild/publishTo := sonatypePublishToBundle.value
45-
ThisBuild/scmInfo := Some(ScmInfo(url("https://github.com/ShiftLeftSecurity/overflowdb"),
46-
"scm:git@github.com:ShiftLeftSecurity/overflowdb.git"))
47-
ThisBuild/homepage := Some(url("https://github.com/ShiftLeftSecurity/overflowdb/"))
47+
ThisBuild / publishTo := sonatypePublishToBundle.value
48+
ThisBuild / scmInfo := Some(
49+
ScmInfo(url("https://github.com/ShiftLeftSecurity/overflowdb"), "scm:git@github.com:ShiftLeftSecurity/overflowdb.git")
50+
)
51+
ThisBuild / homepage := Some(url("https://github.com/ShiftLeftSecurity/overflowdb/"))
4852

49-
ThisBuild/licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
50-
ThisBuild/developers := List(
53+
ThisBuild / licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
54+
ThisBuild / developers := List(
5155
Developer("mpollmeier", "Michael Pollmeier", "michael@michaelpollmeier.com", url("http://www.michaelpollmeier.com/")),
52-
Developer("ml86", "Markus Lottmann", "markus@shiftleft.io", url("https://github.com/ml86")))
53-
54-
Global/cancelable := true
55-
Global/onChangedBuildSource := ReloadOnSourceChanges
56+
Developer("ml86", "Markus Lottmann", "markus@shiftleft.io", url("https://github.com/ml86"))
57+
)
5658

59+
Global / cancelable := true
60+
Global / onChangedBuildSource := ReloadOnSourceChanges

0 commit comments

Comments
 (0)