Skip to content

Commit 59f4cc8

Browse files
committed
Add support for 2.13.0-M5
1 parent 13e8519 commit 59f4cc8

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ 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.11 and 2.12, Play 2.6 and Shapeless 2.3.
13+
The artifacts are built for Scala and Scala.js 2.11, 2.12, and 2.13, Play 2.7 and Shapeless 2.3.
1414

15-
For Play 2.5 compatibility see version [`3.3`](https://github.com/julienrf/play-json-derived-codecs/tree/v3.3).
15+
For Play 2.6 compatibility see version [`4.0.1`](https://github.com/julienrf/play-json-derived-codecs/tree/v4.0.1).
1616

1717
## Usage
1818

build.sbt

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
22

33
scalaVersion in ThisBuild := "2.12.6"
44

5-
crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.12")
5+
crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.12", "2.13.0-M5")
66

77
val library =
88
crossProject(JSPlatform, JVMPlatform)
@@ -13,9 +13,9 @@ val library =
1313
name := "play-json-derived-codecs",
1414
libraryDependencies ++= Seq(
1515
"com.chuusai" %%% "shapeless" % "2.3.3",
16-
"org.scalatest" %%% "scalatest" % "3.0.5" % Test,
17-
"org.scalacheck" %%% "scalacheck" % "1.13.5" % Test,
18-
"com.typesafe.play" %%% "play-json" % "2.6.9"
16+
"org.scalatest" %%% "scalatest" % "3.0.6-SNAP6" % Test,
17+
"org.scalacheck" %%% "scalacheck" % "1.14.0" % Test,
18+
"com.typesafe.play" %%% "play-json" % "2.7.0"
1919
),
2020
publishTo := {
2121
val nexus = "https://oss.sonatype.org"
@@ -38,20 +38,23 @@ val library =
3838
s"scm:git:git@github.com:julienrf/${name.value}.git"
3939
)
4040
),
41-
scalacOptions ++= Seq(
42-
"-deprecation",
43-
"-encoding", "UTF-8",
44-
"-feature",
45-
"-unchecked",
46-
// "-Yinline-warnings",
47-
"-Yno-adapted-args",
48-
"-Ywarn-dead-code",
49-
"-Ywarn-numeric-widen",
50-
"-Ywarn-unused-import",
51-
"-Ywarn-value-discard",
52-
"-Xlint",
53-
"-Xfuture"
54-
),
41+
scalacOptions ++= {
42+
Seq(
43+
"-deprecation",
44+
"-encoding", "UTF-8",
45+
"-feature",
46+
"-unchecked",
47+
"-Ywarn-dead-code",
48+
"-Ywarn-numeric-widen",
49+
"-Ywarn-value-discard",
50+
"-Xlint",
51+
"-Xfuture"
52+
) ++
53+
(CrossVersion.partialVersion(scalaVersion.value) match {
54+
case Some((2, n)) if n >= 13 => Seq("-Xsource:2.14")
55+
case _ => Seq("-Yno-adapted-args", "-Ywarn-unused-import")
56+
})
57+
},
5558
scalacOptions in Test += "-Yrangepos"
5659
)
5760

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
44

55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
66

7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")

0 commit comments

Comments
 (0)