diff options
-rwxr-xr-x | .ci/build | 2 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | build.sbt | 3 | ||||
-rw-r--r-- | project/plugins.sbt | 2 | ||||
-rw-r--r-- | src/main/scala/Tracer.scala | 2 |
5 files changed, 11 insertions, 4 deletions
@@ -7,7 +7,7 @@ sbt scalafmtTest +test if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then # Setup gpg keys gpg --keyserver keyserver.ubuntu.com --recv-key "DC7751D77486D755815C04AB488F99C904F077E8" - openssl aes-256-cbc -K "$encrypted_c6e2aee6c53f_key" -iv "$encrypted_c6e2aee6c53f_iv" -in sec.gpg.enc -out sec.gpg -d + openssl aes-256-cbc -K "$encrypted_c6e2aee6c53f_key" -iv "$encrypted_c6e2aee6c53f_iv" -in .ci/sec.gpg.enc -out sec.gpg -d gpg --import sec.gpg # Set up publishing settings and credentials @@ -1,3 +1,7 @@ +[![Build Status](https://travis-ci.org/drivergroup/tracing.svg?branch=master)](https://travis-ci.org/drivergroup/tracing) +[![Download](https://img.shields.io/maven-central/v/xyz.driver/tracing_2.12.svg)](http://search.maven.org/#search|ga|1|xyz.driver%20tracing-) + + # Driver Tracing Library A vendor-neutral tracing library for Akka-HTTP. @@ -13,7 +17,7 @@ library. Include it in sbt by adding the following snippet to your build.sbt: ```scala -libraryDependencies += "xyz.driver" %% "tracing" % "0.0.1" +libraryDependencies += "xyz.driver" %% "tracing" % "<latest version>" ``` ### Example @@ -4,7 +4,8 @@ version in ThisBuild := { ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim } -scalaVersion := "2.12.3" +crossScalaVersions := Seq("2.11.11", "2.12.3") +scalaVersion := crossScalaVersions.value.last libraryDependencies ++= Seq( "com.pauldijou" %% "jwt-core" % "0.14.0", diff --git a/project/plugins.sbt b/project/plugins.sbt index ab0cfab..a1e2f8a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,3 @@ +ivyLoggingLevel := UpdateLogging.Quiet + addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0") diff --git a/src/main/scala/Tracer.scala b/src/main/scala/Tracer.scala index 3d82489..3eddc1d 100644 --- a/src/main/scala/Tracer.scala +++ b/src/main/scala/Tracer.scala @@ -13,6 +13,6 @@ trait Tracer { def submit(span: Span): Unit /** Aggregate any potentially queued submissions and perform any cleanup logic. */ - def close(): Future[_] = Future.unit + def close(): Future[_] = Future.successful(()) } |