diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-10-05 15:07:09 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-10-05 15:07:09 -0700 |
| commit | 23d923cf71262f913098d29bd2b813fb13dda58b (patch) | |
| tree | 9ba7d37eecea439cfb50b994fdf2c7623164aba6 | |
| parent | c89775a9ec9839d66dfdb5dd45fdfdf12a06ad0f (diff) | |
| download | tracing-23d923cf71262f913098d29bd2b813fb13dda58b.tar.gz tracing-23d923cf71262f913098d29bd2b813fb13dda58b.tar.bz2 tracing-23d923cf71262f913098d29bd2b813fb13dda58b.zip | |
Cross-build for Scala 2.11 and 2.12
| -rw-r--r-- | build.sbt | 3 | ||||
| -rw-r--r-- | src/main/scala/Tracer.scala | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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/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(()) } |