Skip to content

Commit

Permalink
Upgrade to play-json 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz authored and rtyley committed Dec 13, 2023
1 parent d7215d5 commit 1f12075
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
8 changes: 6 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Facia Scala Client [![fapi-client-play28 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play28/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play28) [![Release](https://github.com/guardian/facia-scala-client/actions/workflows/release.yml/badge.svg)](https://github.com/guardian/facia-scala-client/actions/workflows/release.yml)
Facia Scala Client [![fapi-client-play30 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play30/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play30) [![Release](https://github.com/guardian/facia-scala-client/actions/workflows/release.yml/badge.svg)](https://github.com/guardian/facia-scala-client/actions/workflows/release.yml)
==================

Facia's Scala client is split into two parts.
Expand All @@ -11,13 +11,15 @@ easily-used types.

### Adding the dependency to SBT

[![fapi-client-play30 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play30/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play30)

[![fapi-client-play28 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play28/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play28)

[![fapi-client-play27 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play27/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/fapi-client-play27)

Add the following line to your [SBT build file](https://www.scala-sbt.org/1.0/docs/Basic-Def.html):

libraryDependencies += "com.gu" %% "fapi-client-play28" % "3.3.3"
libraryDependencies += "com.gu" %% "fapi-client-play30" % "5.0.0"

### Using the library

Expand All @@ -37,6 +39,8 @@ This library provides underlying behaviour for the main Fronts API client.

### Adding the dependency to SBT

[![facia-json-play30 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play30/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play30)

[![facia-json-play28 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play28/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play28)

[![facia-json-play27 Scala version support](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play27/latest-by-scala-version.svg)](https://index.scala-lang.org/guardian/facia-scala-client/facia-json-play27)
Expand Down
17 changes: 14 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,25 @@ val sonatypeReleaseSettings = Seq(
lazy val root = (project in file(".")).aggregate(
faciaJson_play27,
faciaJson_play28,
faciaJson_play30,
fapiClient_play27,
fapiClient_play28
fapiClient_play28,
fapiClient_play30
).settings(
publish / skip := true,
sonatypeReleaseSettings
)

val exactPlayJsonVersions = Map(
"27" -> "2.7.4",
"28" -> "2.8.2"
"28" -> "2.8.2",
"30" -> "3.0.1"
)

val playJsonGroupId = Map(
"27" -> "com.typesafe.play",
"28" -> "com.typesafe.play",
"30" -> "org.playframework"
)

def baseProject(module: String, majorMinorVersion: String) = Project(s"$module-play$majorMinorVersion", file(s"$module-play$majorMinorVersion"))
Expand All @@ -61,7 +70,7 @@ def faciaJson_playJsonVersion(majorMinorVersion: String) = baseProject("facia-js
libraryDependencies ++= Seq(
awsSdk,
commonsIo,
"com.typesafe.play" %% "play-json" % exactPlayJsonVersions(majorMinorVersion),
playJsonGroupId(majorMinorVersion) %% "play-json" % exactPlayJsonVersions(majorMinorVersion),
"org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
scalaLogging
)
Expand All @@ -80,9 +89,11 @@ def fapiClient_playJsonVersion(majorMinorVersion: String) = baseProject("fapi-c

lazy val faciaJson_play27 = faciaJson_playJsonVersion("27")
lazy val faciaJson_play28 = faciaJson_playJsonVersion("28")
lazy val faciaJson_play30 = faciaJson_playJsonVersion("30")

lazy val fapiClient_play27 = fapiClient_playJsonVersion("27").dependsOn(faciaJson_play27)
lazy val fapiClient_play28 = fapiClient_playJsonVersion("28").dependsOn(faciaJson_play28)
lazy val fapiClient_play30 = fapiClient_playJsonVersion("30").dependsOn(faciaJson_play30)

Test/testOptions += Tests.Argument(
TestFrameworks.ScalaTest,
Expand Down

0 comments on commit 1f12075

Please sign in to comment.