From 50948f3cd2211ad2c9de58677cc258e1ea795c07 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 10 Oct 2018 18:30:03 -0700 Subject: Aggregate core-testkit --- build.sbt | 81 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/build.sbt b/build.sbt index 286e7ec..18ab657 100644 --- a/build.sbt +++ b/build.sbt @@ -11,49 +11,49 @@ scalacOptions in ThisBuild in (Compile, doc) ++= Seq( s"https://github.com/drivergroup/driver-core/blob/master€{FILE_PATH}.scala" ) -val mockito = "org.mockito" % "mockito-core" % "1.9.5" -val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" +val mockito = "org.mockito" % "mockito-core" % "1.9.5" +val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" // TODO these shouldn't be declared in the build scope. They should be moved to the individual // sub-projects that actually depend on them. libraryDependencies in ThisBuild ++= Seq( // please keep these sorted alphabetically - "ch.qos.logback" % "logback-classic" % "1.2.3", - "ch.qos.logback.contrib" % "logback-jackson" % "0.1.5", - "ch.qos.logback.contrib" % "logback-json-classic" % "0.1.5", - "com.aliyun.mns" % "aliyun-sdk-mns" % "1.1.8", - "com.aliyun.oss" % "aliyun-sdk-oss" % "2.8.2", - "com.amazonaws" % "aws-java-sdk-s3" % "1.11.342", - "com.beachape" %% "enumeratum" % "1.5.13", - "com.github.swagger-akka-http" %% "swagger-akka-http" % "1.0.0", - "com.google.cloud" % "google-cloud-pubsub" % "1.31.0", - "com.google.cloud" % "google-cloud-storage" % "1.31.0", - "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.7", - "com.neovisionaries" % "nv-i18n" % "1.23", - "com.pauldijou" %% "jwt-core" % "0.16.0", - "com.softwaremill.sttp" %% "akka-http-backend" % "1.2.2", - "com.softwaremill.sttp" %% "core" % "1.2.2", - "com.typesafe" % "config" % "1.3.3", - "com.typesafe.akka" %% "akka-actor" % "2.5.14", - "com.typesafe.akka" %% "akka-http-core" % "10.1.4", - "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.4", - "com.typesafe.akka" %% "akka-http-testkit" % "10.1.4", - "com.typesafe.akka" %% "akka-stream" % "2.5.14", - "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", - "com.typesafe.slick" %% "slick" % "3.2.3", - "eu.timepit" %% "refined" % "0.9.0", - "io.kamon" %% "kamon-akka-2.5" % "1.0.0", - "io.kamon" %% "kamon-core" % "1.1.3", - "io.kamon" %% "kamon-statsd" % "1.0.0", - "io.kamon" %% "kamon-system-metrics" % "1.0.0", - "javax.xml.bind" % "jaxb-api" % "2.2.8", - mockito % "test", - "org.scala-lang.modules" %% "scala-async" % "0.9.7", - "org.scalacheck" %% "scalacheck" % "1.14.0" % "test", - "org.scalaz" %% "scalaz-core" % "7.2.24", - scalatest % "test", + "ch.qos.logback" % "logback-classic" % "1.2.3", + "ch.qos.logback.contrib" % "logback-jackson" % "0.1.5", + "ch.qos.logback.contrib" % "logback-json-classic" % "0.1.5", + "com.aliyun.mns" % "aliyun-sdk-mns" % "1.1.8", + "com.aliyun.oss" % "aliyun-sdk-oss" % "2.8.2", + "com.amazonaws" % "aws-java-sdk-s3" % "1.11.342", + "com.beachape" %% "enumeratum" % "1.5.13", + "com.github.swagger-akka-http" %% "swagger-akka-http" % "1.0.0", + "com.google.cloud" % "google-cloud-pubsub" % "1.31.0", + "com.google.cloud" % "google-cloud-storage" % "1.31.0", + "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.7", + "com.neovisionaries" % "nv-i18n" % "1.23", + "com.pauldijou" %% "jwt-core" % "0.16.0", + "com.softwaremill.sttp" %% "akka-http-backend" % "1.2.2", + "com.softwaremill.sttp" %% "core" % "1.2.2", + "com.typesafe" % "config" % "1.3.3", + "com.typesafe.akka" %% "akka-actor" % "2.5.14", + "com.typesafe.akka" %% "akka-http-core" % "10.1.4", + "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.4", + "com.typesafe.akka" %% "akka-http-testkit" % "10.1.4", + "com.typesafe.akka" %% "akka-stream" % "2.5.14", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", + "com.typesafe.slick" %% "slick" % "3.2.3", + "eu.timepit" %% "refined" % "0.9.0", + "io.kamon" %% "kamon-akka-2.5" % "1.0.0", + "io.kamon" %% "kamon-core" % "1.1.3", + "io.kamon" %% "kamon-statsd" % "1.0.0", + "io.kamon" %% "kamon-system-metrics" % "1.0.0", + "javax.xml.bind" % "jaxb-api" % "2.2.8", + mockito % "test", + "org.scala-lang.modules" %% "scala-async" % "0.9.7", + "org.scalacheck" %% "scalacheck" % "1.14.0" % "test", + "org.scalaz" %% "scalaz-core" % "7.2.24", + scalatest % "test", "xyz.driver" %% "spray-json-derivation" % "0.6.0", - "xyz.driver" %% "tracing" % "0.1.2" + "xyz.driver" %% "tracing" % "0.1.2" ) lazy val `core-util` = project @@ -92,9 +92,9 @@ lazy val `core-testkit` = project .dependsOn(`core-rest`, `core-database`) .settings( libraryDependencies ++= Seq( - "com.spotify" % "docker-client" % "8.11.7" classifier "shaded", - "org.postgresql" % "postgresql" % "9.4.1212", - "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0", + "com.spotify" % "docker-client" % "8.11.7" classifier "shaded", + "org.postgresql" % "postgresql" % "9.4.1212", + "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0", scalatest ) ) @@ -112,6 +112,7 @@ lazy val core = project `core-init` ) .aggregate( + `core-testkit`, `core-types`, `core-rest`, `core-reporting`, -- cgit v1.2.3