Skip to content

Commit c0061ca

Browse files
authored
Merge pull request #95 from davidfurey/play-json-3.0
Update play-json dependency to 3.x, update README. Fixes #91
2 parents 214b5a1 + 9b14ac3 commit c0061ca

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: coursier/cache-action@v5
11-
- uses: olafurpg/setup-scala@v10
11+
- uses: actions/setup-java@v2
12+
with:
13+
java-version: '11'
14+
distribution: 'adopt'
1215
- run: git fetch --unshallow
1316
- run: sbt +test libraryJVM/versionPolicyCheck

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- uses: actions/[email protected]
12-
- uses: olafurpg/setup-scala@v10
12+
- uses: actions/setup-java@v2
13+
with:
14+
java-version: '11'
15+
distribution: 'adopt'
1316
- uses: coursier/cache-action@v5
1417
- run: git fetch --unshallow
1518
- run: sbt versionCheck ci-release

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,17 @@ Compared to the built-in macros, this project brings support for:
1010
- recursive types ;
1111
- polymorphic types.
1212

13-
The artifacts are built for Scala and Scala.js 2.12, and 2.13, Play 2.9 and Shapeless 2.3.
13+
The artifacts are built for Scala and Scala.js 2.12, and 2.13, Play 3.0 and Shapeless 2.3.
1414

15-
For Play 2.8 compatibility see version [`7.0.0`](https://github.com/julienrf/play-json-derived-codecs/tree/v6.0.0).
15+
## Versions
16+
17+
For previous versions of Play, you can use previous versions of this library:
18+
19+
| Library version | Play version |
20+
|-----------------------------------------------------------------------------|-----------------|
21+
| [Latest](https://github.com/julienrf/play-json-derived-codecs/releases) | 3.0.x |
22+
| [10.1.0](https://github.com/julienrf/play-json-derived-codecs/tree/v10.1.0) | 2.9.x |
23+
| [7.0.0](https://github.com/julienrf/play-json-derived-codecs/tree/v7.0.0) | 2.8.x |
1624

1725
## Usage
1826

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ThisBuild / scalaVersion := "2.13.3"
77

88
ThisBuild / crossScalaVersions := Seq(scalaVersion.value, "2.12.8")
99

10-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
10+
ThisBuild / versionPolicyIntention := Compatibility.None
1111

1212
ThisBuild / mimaBinaryIssueFilters ++= Seq(
1313
// package private method
@@ -42,7 +42,7 @@ val library =
4242
"org.scalatest" %%% "scalatest" % "3.2.3" % Test,
4343
"org.scalacheck" %%% "scalacheck" % "1.15.2" % Test,
4444
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.3.0" % Test,
45-
"com.typesafe.play" %%% "play-json" % "2.9.2"
45+
"org.playframework" %%% "play-json" % "3.0.1"
4646
),
4747
scalacOptions ++= {
4848
Seq(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
44

55
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
66

0 commit comments

Comments
 (0)