|
1 | 1 | 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") |
5 | 5 | // TODO once we're on Scala 3.2.2: make chained implicits in `Implicits.scala` available again
|
6 | 6 | // also, change other places that have temporarily been adapted - search for `TODO Scala 3.2.2`
|
7 |
| -publish/skip := true |
| 7 | +publish / skip := true |
8 | 8 |
|
9 |
| -lazy val core = project.in(file("core")) |
| 9 | +lazy val core = project.in(file("core")) |
10 | 10 | 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) |
15 | 15 |
|
16 |
| -ThisBuild/libraryDependencies ++= Seq( |
| 16 | +ThisBuild / libraryDependencies ++= Seq( |
17 | 17 | "org.slf4j" % "slf4j-simple" % "2.0.7" % Test,
|
18 |
| - "org.scalatest" %% "scalatest" % "3.2.15" % Test, |
| 18 | + "org.scalatest" %% "scalatest" % "3.2.16" % Test |
19 | 19 | )
|
20 | 20 |
|
21 |
| -ThisBuild/scalacOptions ++= Seq( |
22 |
| - "-release", "8", |
| 21 | +ThisBuild / scalacOptions ++= Seq( |
| 22 | + "-release", |
| 23 | + "8", |
23 | 24 | "-deprecation",
|
24 | 25 | "-feature"
|
25 | 26 | )
|
26 | 27 |
|
27 | 28 | ThisBuild / compile / javacOptions ++= Seq(
|
28 |
| - "-g", //debug symbols |
29 |
| - "--release", "8" |
| 29 | + "-g", // debug symbols |
| 30 | + "--release", |
| 31 | + "8" |
30 | 32 | )
|
31 | 33 |
|
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 |
34 | 36 |
|
35 |
| -ThisBuild/resolvers ++= Seq( |
| 37 | +ThisBuild / resolvers ++= Seq( |
36 | 38 | 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 | +) |
38 | 41 |
|
39 |
| -ThisBuild/Compile/scalacOptions ++= Seq( |
40 |
| - "-language:implicitConversions", |
| 42 | +ThisBuild / Compile / scalacOptions ++= Seq( |
| 43 | + "-language:implicitConversions" |
41 | 44 | // "-language:existentials",
|
42 | 45 | )
|
43 | 46 |
|
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/")) |
48 | 52 |
|
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( |
51 | 55 | 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 | +) |
56 | 58 |
|
| 59 | +Global / cancelable := true |
| 60 | +Global / onChangedBuildSource := ReloadOnSourceChanges |
0 commit comments