diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2018-06-05 22:07:13 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2018-06-05 22:09:02 -0700 |
| commit | 617a624a7a2b7d6b7fb6f5a659a8761b7341eaf1 (patch) | |
| tree | 0acf4ca5cdfb8d15c44952d4cc8ee193b40c21d8 | |
| parent | 22306dcd74c56ec68cc8776353264badabd0abf7 (diff) | |
| download | driver-core-617a624a7a2b7d6b7fb6f5a659a8761b7341eaf1.tar.gz driver-core-617a624a7a2b7d6b7fb6f5a659a8761b7341eaf1.tar.bz2 driver-core-617a624a7a2b7d6b7fb6f5a659a8761b7341eaf1.zip | |
Full upgrade of build and library dependencies
| -rw-r--r-- | build.sbt | 33 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | src/test/scala/xyz/driver/core/TimeTest.scala | 4 |
4 files changed, 22 insertions, 19 deletions
@@ -7,24 +7,27 @@ lazy val core = (project in file(".")) .driverLibrary("core") .settings(lintingSettings ++ formatSettings) .settings(libraryDependencies ++= Seq( - "xyz.driver" %% "tracing" % "0.0.2", + "xyz.driver" %% "tracing" % "0.1.0", + "com.typesafe.akka" %% "akka-actor" % "2.5.13", + "com.typesafe.akka" %% "akka-stream" % "2.5.13", "com.typesafe.akka" %% "akka-http-core" % akkaHttpV, "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpV, "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV, - "com.pauldijou" %% "jwt-core" % "0.14.0", - "org.scalatest" %% "scalatest" % "3.0.2" % "test", - "org.scalacheck" %% "scalacheck" % "1.13.4" % "test", - "org.scalaz" %% "scalaz-core" % "7.2.19", - "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.11.2", - "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0", - "eu.timepit" %% "refined" % "0.8.4", - "com.typesafe.slick" %% "slick" % "3.2.1", + "com.pauldijou" %% "jwt-core" % "0.16.0", + "org.scalatest" %% "scalatest" % "3.0.5" % "test", + "org.scalacheck" %% "scalacheck" % "1.14.0" % "test", + "org.scalaz" %% "scalaz-core" % "7.2.24", + "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.14.0", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", + "eu.timepit" %% "refined" % "0.9.0", + "com.typesafe.slick" %% "slick" % "3.2.3", "com.beachape" %% "enumeratum" % "1.5.13", "org.mockito" % "mockito-core" % "1.9.5" % Test, - "com.amazonaws" % "aws-java-sdk-s3" % "1.11.26", - "com.google.cloud" % "google-cloud-pubsub" % "0.42.1-beta", - "com.google.cloud" % "google-cloud-storage" % "1.24.1", - "com.typesafe" % "config" % "1.3.1", - "ch.qos.logback" % "logback-classic" % "1.1.11", - "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.2" + "com.amazonaws" % "aws-java-sdk-s3" % "1.11.342", + "com.google.cloud" % "google-cloud-pubsub" % "1.31.0", + "com.google.cloud" % "google-cloud-storage" % "1.31.0", + "com.typesafe" % "config" % "1.3.3", + "ch.qos.logback" % "logback-classic" % "1.2.3", + "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.7" )) + .settings(scalaVersion := "2.12.6") diff --git a/project/build.properties b/project/build.properties index 8b697bb..d6e3507 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.1.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index b1fa5f8..22f8d96 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" -addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.8") +addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.11") diff --git a/src/test/scala/xyz/driver/core/TimeTest.scala b/src/test/scala/xyz/driver/core/TimeTest.scala index 5552a7d..7a888b6 100644 --- a/src/test/scala/xyz/driver/core/TimeTest.scala +++ b/src/test/scala/xyz/driver/core/TimeTest.scala @@ -14,8 +14,8 @@ import scala.concurrent.duration._ class TimeTest extends FlatSpec with Matchers with Checkers { - implicit val arbitraryDuration = Arbitrary[Duration](Gen.chooseNum(0L, 9999999999L).map(_.milliseconds)) - implicit val arbitraryTime = Arbitrary[Time](Gen.chooseNum(0L, 9999999999L).map(millis => Time(millis))) + implicit val arbDuration = Arbitrary[Duration](Gen.chooseNum(0L, 9999999999L).map(_.milliseconds)) + implicit val arbTime = Arbitrary[Time](Gen.chooseNum(0L, 9999999999L).map(millis => Time(millis))) "Time" should "have correct methods to compare" in { |