Skip to content

Commit

Permalink
chore(dependencies): Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ElPicador committed Jul 19, 2017
1 parent 2c99c3b commit b97a3fa
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 48 deletions.
68 changes: 32 additions & 36 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,24 @@ scalaVersion := "2.11.7"
ScoverageSbtPlugin.ScoverageKeys.coverageHighlighting := false //setting to true crashes the coverage
//coverageEnabled := true

val asyncHttpClientVersion = "2.0.4"

val asyncHttpClientVersion = "2.0.33"
val json4sVersion = "3.5.2"
val logbackVersion = "1.2.3"
val scalaUriVersion = "0.4.16"

val scalaTestVersion = "2.2.6"
val scalaMockVersion = "3.2"
val scalacheckVersion = "1.12.1"
val scalaTestVersion = "3.0.1"
val scalaMockVersion = "3.4.2"
val scalacheckVersion = "1.12.6"

libraryDependencies += "org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion

libraryDependencies += "org.json4s" %% "json4s-ast" % json4sVersion
libraryDependencies += "org.json4s" %% "json4s-core" % json4sVersion
libraryDependencies += "org.json4s" %% "json4s-native" % json4sVersion

libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.3"
libraryDependencies += "ch.qos.logback" % "logback-classic" % logbackVersion

libraryDependencies += "com.netaporter" %% "scala-uri" % "0.4.14"
libraryDependencies += "io.lemonlabs" %% "scala-uri" % scalaUriVersion

//Testing
libraryDependencies += "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
Expand All @@ -49,37 +50,32 @@ scalacOptions ++= Seq("-feature", "-unchecked")
* see: https://github.com/xerial/sbt-sonatype
*
**/
headers := Map(
"scala" -> (
de.heikoseeberger.sbtheader.HeaderPattern.cStyleBlockComment,
"""|/*
| * The MIT License (MIT)
| *
| * Copyright (c) 2016 Algolia
| * http://www.algolia.com/
| *
| * Permission is hereby granted, free of charge, to any person obtaining a copy
| * of this software and associated documentation files (the "Software"), to deal
| * in the Software without restriction, including without limitation the rights
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
| * copies of the Software, and to permit persons to whom the Software is
| * furnished to do so, subject to the following conditions:
| *
| * The above copyright notice and this permission notice shall be included in
| * all copies or substantial portions of the Software.
| *
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
| * THE SOFTWARE.
| */
headerLicense := Some(
HeaderLicense.Custom(
"""The MIT License (MIT)
|
|Copyright (c) 2016 Algolia
|http://www.algolia.com/
|
|Permission is hereby granted, free of charge, to any person obtaining a copy
|of this software and associated documentation files (the "Software"), to deal
|in the Software without restriction, including without limitation the rights
|to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|copies of the Software, and to permit persons to whom the Software is
|furnished to do so, subject to the following conditions:
|
|The above copyright notice and this permission notice shall be included in
|all copies or substantial portions of the Software.
|
|THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|THE SOFTWARE.
|""".stripMargin
)
)
))

lazy val myProject = project
.in(file("."))
Expand Down
9 changes: 4 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.2")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")

//Release
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")

//Auto MIT Licence Header
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.5.1")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "2.0.0")

//Auto version
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.5.0")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")

//Formatter
Expand Down
7 changes: 0 additions & 7 deletions src/main/scala/algolia/AlgoliaClient.scala
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,6 @@ class AlgoliaClient(applicationId: String,
}
}

sealed trait Toto

object Start extends Toto
case class `4XX`[T](e: `4XXAPIException`) extends Toto
case class UnknownException[T](e: Throwable) extends Toto
case class Ok[T](r: T) extends Toto

private[algolia] case class StartException() extends Exception

class AlgoliaClientException(message: String, exception: Throwable)
Expand Down

0 comments on commit b97a3fa

Please sign in to comment.