Update sbt to 1.3.0 (#49)

* Update sbt to the latest 1.3.0 * Rework the projects build definition * Update all plugins * Update all deps * Make sbt files compliant with new DSL * Fix modules names * Update default Scala version * Drop JDK 7 from CI

Author: alexandrnikitin

.travis.yml

@@ -2,7 +2,7 @@ language: scala
 matrix:
  include:
  - scala: 2.10.7
- jdk: openjdk7
+ jdk: openjdk8
  dist: trusty
  - scala: 2.11.12
  jdk: openjdk8

build.sbt

@@ -0,0 +1,41 @@
+import com.typesafe.sbt.packager.archetypes.JavaAppPackaging
+import pl.project13.scala.sbt.JmhPlugin
+import sbt._
+
+lazy val root = (project in file("."))
+ .aggregate(bloomFilter, tests, examples)
+ .configs(Configs.all)
+ .settings(name := "bloom-filter-root", Settings.root)
+ .enablePlugins()
+
+lazy val bloomFilter = (project in file("bloom-filter"))
+ .configs(Configs.all)
+ .settings(name := "bloom-filter", Settings.bloomfilter)
+
+lazy val sandbox = (project in file("sandbox"))
+ .dependsOn(bloomFilter)
+ .configs(Configs.all)
+ .settings(Settings.sandbox)
+
+lazy val sandboxApp = (project in file("sandboxApp"))
+ .dependsOn(bloomFilter)
+ .configs(Configs.all)
+ .settings(Settings.sandboxApp)
+ .enablePlugins(JavaAppPackaging)
+
+lazy val tests = (project in file("tests"))
+ .dependsOn(bloomFilter, sandbox)
+ .configs(Configs.all)
+ .settings(Settings.tests)
+
+lazy val benchmarks = (project in file("benchmarks"))
+ .dependsOn(bloomFilter, sandbox)
+ .configs(Configs.all)
+ .settings(Settings.benchmarks)
+ .enablePlugins(JmhPlugin)
+
+lazy val examples = (project in file("examples"))
+ .dependsOn(bloomFilter)
+ .configs(Configs.all)
+ .settings(Settings.examples)
+ .enablePlugins(JavaAppPackaging)

project/Configs.scala

@@ -2,5 +2,5 @@ import sbt._
 
 object Configs {
  val EndToEndTest = config("endToEnd") extend Runtime
- val all = Seq(EndToEndTest)
+ val all = EndToEndTest
 }

project/Dependencies.scala

@@ -3,12 +3,12 @@ import sbt._
 
 object Dependencies {
  private val scalatest = "org.scalatest" %% "scalatest" % "3.1.1" % "test;endToEnd"
- private val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
+ private val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
  private val googleGuava = "com.google.guava" % "guava" % "19.0"
  private val googleFindbugs = "com.google.code.findbugs" % "jsr305" % "2.0.3" // needed by guava
- private val breeze = "org.scalanlp" %% "breeze" % "0.12"
- private val breezeNatives = "org.scalanlp" %% "breeze-natives" % "0.12"
- private val algebird = "com.twitter" %% "algebird-core" % "0.11.0"
+ private val breeze = "org.scalanlp" %% "breeze" % "1.0"
+ private val breezeNatives = "org.scalanlp" %% "breeze-natives" % "1.0"
+ private val algebird = "com.twitter" %% "algebird-core" % "0.13.6"
  private val sketches = "com.yahoo.datasketches" % "sketches-core" % "0.3.2"
  private val chronicleBytes = "net.openhft" % "chronicle-bytes" % "1.2.3"
  private val allocationInstrumenter = "com.google.code.java-allocation-instrumenter" % "java-allocation-instrumenter" % "3.0.1"

project/Publishing.scala

@@ -1,4 +1,3 @@
-import com.typesafe.sbt.pgp.PgpSettings._
 import sbt.Keys._
 import sbt._
 
@@ -11,13 +10,9 @@ object Publishing {
  } yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq
  )
 
- private lazy val pgpSettings =
- Option(System.getenv().get("PGP_PASSPHRASE"))
- .map(s => pgpPassphrase := Some(s.toCharArray)).toSeq
-
  private lazy val sharedSettings = Seq(
  publishMavenStyle := true,
- publishArtifact in Test := false,
+ Test / publishArtifact := false,
  pomIncludeRepository := Function.const(false),
  publishTo := {
  val nexus = "https://oss.sonatype.org/"
@@ -35,7 +30,7 @@ object Publishing {
  developers := List(Developer("AlexandrNikitin", "Alexandr Nikitin", "nikitin.alexandr.a@gmail.com", url("https://github.com/alexandrnikitin/")))
  )
 
- lazy val settings = generalSettings ++ sharedSettings ++ credentialSettings ++ pgpSettings
+ lazy val settings = generalSettings ++ sharedSettings ++ credentialSettings
 
  lazy val noPublishSettings = Seq(
  publish :=(),

project/Settings.scala

@@ -4,7 +4,7 @@ import sbt.Keys._
 object Settings {
 
  private lazy val build = Seq(
- scalaVersion := "2.12.2",
+ scalaVersion := "2.12.11",
  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.11", "2.13.1"),
 
  autoCompilerPlugins := true,

project/Testing.scala

@@ -8,21 +8,21 @@ object Testing {
  import Configs._
 
  private lazy val testSettings = Seq(
- fork in Test := false,
- parallelExecution in Test := false,
- testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2")
+ Test / fork := false,
+ Test / parallelExecution := false,
+ Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2")
  )
 
  private lazy val e2eSettings = inConfig(EndToEndTest)(Defaults.testSettings) ++ Seq(
- fork in EndToEndTest := false,
- parallelExecution in EndToEndTest := false,
- scalaSource in EndToEndTest := baseDirectory.value / "src/endToEnd/scala"
+ EndToEndTest / fork := false,
+ EndToEndTest / parallelExecution := false,
+ EndToEndTest / scalaSource := baseDirectory.value / "src/endToEnd/scala"
  )
 
  private lazy val testAllSettings = Seq(
  testAll :=(),
- testAll <<= testAll.dependsOn(test in EndToEndTest),
- testAll <<= testAll.dependsOn(test in Test)
+ testAll := testAll.dependsOn(EndToEndTest / test),
+ testAll := testAll.dependsOn(Test / test)
  )
 
  private lazy val scoverageSettings = Seq(

project/TheBuild.scala

@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 1.3.0

project/build.properties

@@ -1,13 +1,13 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.21")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.0")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.1.1")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")