From 4f06b95f3a549e24480e9dffa549da5082b9a861 Mon Sep 17 00:00:00 2001 From: Christophe Billiard Date: Sun, 19 May 2019 17:14:10 +0200 Subject: [PATCH] [#48] Update project dependencies to latest version --- build.sbt | 15 ++++++++------- project/plugins.sbt | 10 +++++----- .../org/mdedetrich/stripe/v1/Collections.scala | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 439684a..d940616 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "stripe-scala" val currentScalaVersion = "2.12.8" val scala211Version = "2.11.11" -val circeVersion = "0.9.3" +val circeVersion = "0.11.1" scalaVersion := currentScalaVersion @@ -31,12 +31,13 @@ Defaults.itSettings configs(IntegrationTest) -val enumeratumVersion = "1.5.12" -val enumeratumCirceVersion = "1.5.14" +val enumeratumVersion = "1.5.13" +val enumeratumCirceVersion = "1.5.21" val akkaStreamJson = "3.4.0" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-http" % "10.0.9", + "com.typesafe.akka" %% "akka-http" % "10.1.8", + "com.typesafe.akka" %% "akka-stream" % "2.5.22", "de.knutwalker" %% "akka-stream-circe" % akkaStreamJson, "de.knutwalker" %% "akka-http-circe" % akkaStreamJson, "io.circe" %% "circe-core" % circeVersion, @@ -44,9 +45,9 @@ libraryDependencies ++= Seq( "io.circe" %% "circe-parser" % circeVersion, "com.beachape" %% "enumeratum" % enumeratumVersion, "com.beachape" %% "enumeratum-circe" % enumeratumCirceVersion, - "com.iheart" %% "ficus" % "1.4.1", - "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2", - "org.scalatest" %% "scalatest" % "3.0.3" % "test, it", + "com.iheart" %% "ficus" % "1.4.6", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", + "org.scalatest" %% "scalatest" % "3.0.7" % "test, it", "ch.qos.logback" % "logback-classic" % "1.2.3" % "test, it" ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6c757f9..326cd19 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.0.0") +addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") \ No newline at end of file diff --git a/src/main/scala/org/mdedetrich/stripe/v1/Collections.scala b/src/main/scala/org/mdedetrich/stripe/v1/Collections.scala index 4b2a977..219e2b3 100644 --- a/src/main/scala/org/mdedetrich/stripe/v1/Collections.scala +++ b/src/main/scala/org/mdedetrich/stripe/v1/Collections.scala @@ -18,10 +18,10 @@ object Collections { trait ListJsonMappers[A] { protected def listDecoder[B <: List[A]]( implicit decoder: Decoder[A]): ((String, Boolean, scala.List[A], Option[Long]) => B) => Decoder[B] = - Decoder.forProduct4[String, Boolean, scala.List[A], Option[Long], B]("url", "has_more", "data", "total_count") + Decoder.forProduct4[B, String, Boolean, scala.List[A], Option[Long]]("url", "has_more", "data", "total_count") protected def listEncoder[B <: List[A]](implicit encoder: Encoder[A]): ObjectEncoder[B] = - Encoder.forProduct5[String, String, Boolean, scala.List[A], Option[Long], B]("object", + Encoder.forProduct5[B, String, String, Boolean, scala.List[A], Option[Long]]("object", "url", "has_more", "data",