From e040b16d0fa924d62735067001db9df94be2f608 Mon Sep 17 00:00:00 2001 From: Mat Mannion Date: Thu, 9 Nov 2023 08:32:17 +0000 Subject: [PATCH 1/4] Update play-json dependency to 3.x, update README. Fixes #91 --- README.md | 12 ++++++++++-- build.sbt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f155575..515fd02 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,17 @@ Compared to the built-in macros, this project brings support for: - recursive types ; - polymorphic types. -The artifacts are built for Scala and Scala.js 2.12, and 2.13, Play 2.9 and Shapeless 2.3. +The artifacts are built for Scala and Scala.js 2.12, and 2.13, Play 3.0 and Shapeless 2.3. -For Play 2.8 compatibility see version [`7.0.0`](https://github.com/julienrf/play-json-derived-codecs/tree/v6.0.0). +## Versions + +For previous versions of Play, you can use previous versions of this library: + +| Library version | Play version | +|-----------------------------------------------------------------------------|-----------------| +| [Latest](https://github.com/julienrf/play-json-derived-codecs/releases) | 3.0.x | +| [10.1.0](https://github.com/julienrf/play-json-derived-codecs/tree/v10.1.0) | 2.9.x | +| [7.0.0](https://github.com/julienrf/play-json-derived-codecs/tree/v7.0.0) | 2.8.x | ## Usage diff --git a/build.sbt b/build.sbt index d4b2d66..6cb346a 100644 --- a/build.sbt +++ b/build.sbt @@ -42,7 +42,7 @@ val library = "org.scalatest" %%% "scalatest" % "3.2.3" % Test, "org.scalacheck" %%% "scalacheck" % "1.15.2" % Test, "org.scalatestplus" %%% "scalacheck-1-15" % "3.2.3.0" % Test, - "com.typesafe.play" %%% "play-json" % "2.9.2" + "org.playframework" %%% "play-json" % "3.0.1" ), scalacOptions ++= { Seq( From 612bc5d7af38e0076169c61cc080a1dc1aea3daa Mon Sep 17 00:00:00 2001 From: David Furey Date: Wed, 10 Apr 2024 09:22:45 +0100 Subject: [PATCH 2/4] Next release will not be binary or source compatible --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6cb346a..ea9c436 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ ThisBuild / scalaVersion := "2.13.3" ThisBuild / crossScalaVersions := Seq(scalaVersion.value, "2.12.8") -ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible +ThisBuild / versionPolicyIntention := Compatibility.None ThisBuild / mimaBinaryIssueFilters ++= Seq( // package private method From e38976f74d37d442570bca1f51d087dcf5e20bd7 Mon Sep 17 00:00:00 2001 From: David Furey Date: Wed, 10 Apr 2024 09:23:07 +0100 Subject: [PATCH 3/4] Bump scalajs to match play-json --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c543a2d..b246bd4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") From 9b14ac3ca12e60ab83cf9893c46e1e574dba7f23 Mon Sep 17 00:00:00 2001 From: David Furey Date: Wed, 10 Apr 2024 14:27:06 +0100 Subject: [PATCH 4/4] Replace deprecated olafurpg/setup-scala with actions/setup-java --- .github/workflows/ci.yml | 5 ++++- .github/workflows/release.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab8b9dc..9465d43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,9 @@ jobs: steps: - uses: actions/checkout@v2 - uses: coursier/cache-action@v5 - - uses: olafurpg/setup-scala@v10 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' - run: git fetch --unshallow - run: sbt +test libraryJVM/versionPolicyCheck diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91da9bf..b52ae4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,10 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2.3.4 - - uses: olafurpg/setup-scala@v10 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' - uses: coursier/cache-action@v5 - run: git fetch --unshallow - run: sbt versionCheck ci-release