diff options
| author | Omar Alejandro Mainegra Sarduy <omainegra@gmail.com> | 2017-08-11 17:45:29 -0400 |
|---|---|---|
| committer | Omar Alejandro Mainegra Sarduy <omainegra@gmail.com> | 2017-08-11 17:45:29 -0400 |
| commit | ad28cb44c9a39b6bb5b7176358381b19b6e9ac28 (patch) | |
| tree | 7a0a10f6270e3233633eda1e7f6b90ea4a12085d /build.sbt | |
| parent | c6c1f5a34930946e8ab4e9248b9255ce2e1464fe (diff) | |
| parent | 00e10184c05431d2692d2b54425481a67ee3bc8e (diff) | |
| download | sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.tar.gz sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.tar.bz2 sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.zip | |
Merge branch 'master' into okhttp3-monix
# Conflicts:
# build.sbt
# okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -36,6 +36,8 @@ val akkaHttp = "com.typesafe.akka" %% "akka-http" % akkaHttpVersion val monixVersion = "2.3.0" val monix = "io.monix" %% "monix" % monixVersion +val circeVersion = "0.8.0" + val scalaTest = "org.scalatest" %% "scalatest" % "3.0.3" lazy val rootProject = (project in file(".")) @@ -51,6 +53,7 @@ lazy val rootProject = (project in file(".")) catsAsyncHttpClientHandler, okhttpClientHandler, okhttpMonixClientHandler, + circe, tests ) @@ -136,6 +139,17 @@ lazy val okhttpMonixClientHandler: Project = (project in file( libraryDependencies ++= Seq(monix) ) dependsOn okhttpClientHandler +lazy val circe: Project = (project in file("circe")) + .settings(commonSettings: _*) + .settings( + name := "circe", + libraryDependencies ++= Seq( + "io.circe" %% "circe-core" % circeVersion, + "io.circe" %% "circe-parser" % circeVersion, + scalaTest % "test" + ) + ) dependsOn core + lazy val tests: Project = (project in file("tests")) .settings(commonSettings: _*) .settings( |