Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -31,22 +31,23 @@ 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,
"io.circe" %% "circe-generic" % circeVersion,
"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"
)

Expand Down
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 2 additions & 2 deletions src/main/scala/org/mdedetrich/stripe/v1/Collections.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down