diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2018-06-05 21:59:09 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2018-06-05 22:10:49 -0700 |
| commit | 705e615fe0be55ea0116d2810d24a30cf11f24d3 (patch) | |
| tree | ba2006311fa675021fc9fd42c820235518412204 | |
| parent | 600db9b151154d3ee6e14eff3c0b9296a32a9d90 (diff) | |
| download | tracing-705e615fe0be55ea0116d2810d24a30cf11f24d3.tar.gz tracing-705e615fe0be55ea0116d2810d24a30cf11f24d3.tar.bz2 tracing-705e615fe0be55ea0116d2810d24a30cf11f24d3.zip | |
Upgrade build and dependenciesv0.1.0
| -rwxr-xr-x | .ci/build | 2 | ||||
| -rw-r--r-- | build.sbt | 14 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | project/publish.sbt | 2 |
5 files changed, 12 insertions, 10 deletions
@@ -1,7 +1,7 @@ #!/bin/bash set -ev -sbt scalafmtTest +test +sbt scalafmtCheck +test # Automatic publishing for tags that start with `v<digit>` if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then @@ -4,16 +4,18 @@ version in ThisBuild := { ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim } -crossScalaVersions := Seq("2.11.11", "2.12.3") +crossScalaVersions := Seq("2.11.12", "2.12.6") scalaVersion := crossScalaVersions.value.last libraryDependencies ++= Seq( - "com.pauldijou" %% "jwt-core" % "0.14.0", - "com.typesafe.akka" %% "akka-http" % "10.0.10", - "com.typesafe.akka" %% "akka-http-spray-json" % "10.0.10", + "com.pauldijou" %% "jwt-core" % "0.16.0", + "com.typesafe.akka" %% "akka-http" % "10.1.1", + "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.1", + "com.typesafe.akka" %% "akka-actor" % "2.5.13", + "com.typesafe.akka" %% "akka-stream" % "2.5.13", "io.spray" %% "spray-json" % "1.3.3", - "com.typesafe.akka" %% "akka-http-testkit" % "10.0.10" % "test", - "org.scalatest" %% "scalatest" % "3.0.2" % "test", + "com.typesafe.akka" %% "akka-http-testkit" % "10.1.1" % "test", + "org.scalatest" %% "scalatest" % "3.0.5" % "test", ) fork in test := true diff --git a/project/build.properties b/project/build.properties index 369929b..d6e3507 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.2
\ No newline at end of file +sbt.version=1.1.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index a1e2f8a..a3e7e05 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ ivyLoggingLevel := UpdateLogging.Quiet -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0") +addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") diff --git a/project/publish.sbt b/project/publish.sbt index 2f35a0c..8a0d471 100644 --- a/project/publish.sbt +++ b/project/publish.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") |