Skip to content

Commit b10b6a1

Browse files
authored
json4s 4.0.5 (#653)
1 parent 789247f commit b10b6a1

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

build.sbt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
organization := "com.algolia"
22
name := "algoliasearch-scala"
33
description := "Scala client for Algolia Search API"
4-
crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.6")
5-
scalaVersion := "2.13.6"
4+
crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.8")
5+
scalaVersion := "2.13.8"
66
Test / testOptions += Tests.Argument("-P10")
77
publishMavenStyle := true
88
Test / publishArtifact := false
@@ -24,7 +24,9 @@ developers += Developer(
2424
url("https://github.com/algolia/algoliasearch-client-scala/")
2525
)
2626
publishTo := sonatypePublishToBundle.value
27-
pgpSigningKey := Credentials.forHost(credentials.value, "pgp").map(_.userName) // related to https://github.com/sbt/sbt-pgp/issues/170
27+
pgpSigningKey := Credentials
28+
.forHost(credentials.value, "pgp")
29+
.map(_.userName) // related to https://github.com/sbt/sbt-pgp/issues/170
2830

2931
lazy val root = project
3032
.in(file("."))
@@ -42,21 +44,21 @@ lazy val root = project
4244
// Project dependencies
4345
libraryDependencies += "org.asynchttpclient" % "async-http-client" % "2.12.3"
4446
libraryDependencies += "io.netty" % "netty-resolver-dns" % "4.1.45.Final"
45-
libraryDependencies += "org.json4s" %% "json4s-ast" % "3.6.7"
46-
libraryDependencies += "org.json4s" %% "json4s-core" % "3.6.7"
47-
libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.7"
48-
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.4"
49-
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.30"
47+
libraryDependencies += "org.json4s" %% "json4s-ast" % "4.0.5"
48+
libraryDependencies += "org.json4s" %% "json4s-core" % "4.0.5"
49+
libraryDependencies += "org.json4s" %% "json4s-native" % "4.0.5"
50+
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.7.0"
51+
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.36"
5052

5153
// Related to https://snyk.io/vuln/SNYK-JAVA-IONETTY-1584063,
5254
// To be removed when 'async-http-client' updates dependency version of 'netty-codec'
5355
libraryDependencies += "io.netty" % "netty-codec" % "4.1.68.Final"
5456

5557
// Testing dependencies
56-
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % Test
58+
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.11" % Test
5759
//libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.3" % Test
58-
libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test
59-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % Test
60+
libraryDependencies += "org.scalamock" %% "scalamock" % "5.2.0" % Test
61+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.11" % Test
6062

6163
scalacOptions ++= Seq(
6264
"-deprecation",

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.2
1+
sbt.version=1.6.2

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
2-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.4.0")
1+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
2+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
33
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
4-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.1")
5-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
4+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
5+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12")
66
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

src/main/scala/algolia/AlgoliaHttpClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ case class AlgoliaHttpClient(
105105
}
106106

107107
def fromJson(r: Response): JValue =
108-
parse(StringInput(r.getResponseBody), useBigDecimalForDouble = true)
108+
parse(r.getResponseBodyAsStream, useBigDecimalForDouble = true)
109109

110110
def makeRequest[T](host: String, request: Request, handler: AsyncHandler[T])(
111111
implicit executor: ExecutionContext

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "1.44.1"
1+
ThisBuild / version := "1.45.0"

0 commit comments

Comments
 (0)