Skip to content

Commit

Permalink
Add support for 2.13.0-M5
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrf committed Jan 17, 2019
1 parent 13e8519 commit 59f4cc8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ 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.11 and 2.12, Play 2.6 and Shapeless 2.3.
The artifacts are built for Scala and Scala.js 2.11, 2.12, and 2.13, Play 2.7 and Shapeless 2.3.

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

## Usage

Expand Down
39 changes: 21 additions & 18 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

scalaVersion in ThisBuild := "2.12.6"

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

val library =
crossProject(JSPlatform, JVMPlatform)
Expand All @@ -13,9 +13,9 @@ val library =
name := "play-json-derived-codecs",
libraryDependencies ++= Seq(
"com.chuusai" %%% "shapeless" % "2.3.3",
"org.scalatest" %%% "scalatest" % "3.0.5" % Test,
"org.scalacheck" %%% "scalacheck" % "1.13.5" % Test,
"com.typesafe.play" %%% "play-json" % "2.6.9"
"org.scalatest" %%% "scalatest" % "3.0.6-SNAP6" % Test,
"org.scalacheck" %%% "scalacheck" % "1.14.0" % Test,
"com.typesafe.play" %%% "play-json" % "2.7.0"
),
publishTo := {
val nexus = "https://oss.sonatype.org"
Expand All @@ -38,20 +38,23 @@ val library =
s"scm:git:[email protected]:julienrf/${name.value}.git"
)
),
scalacOptions ++= Seq(
"-deprecation",
"-encoding", "UTF-8",
"-feature",
"-unchecked",
// "-Yinline-warnings",
"-Yno-adapted-args",
"-Ywarn-dead-code",
"-Ywarn-numeric-widen",
"-Ywarn-unused-import",
"-Ywarn-value-discard",
"-Xlint",
"-Xfuture"
),
scalacOptions ++= {
Seq(
"-deprecation",
"-encoding", "UTF-8",
"-feature",
"-unchecked",
"-Ywarn-dead-code",
"-Ywarn-numeric-widen",
"-Ywarn-value-discard",
"-Xlint",
"-Xfuture"
) ++
(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n >= 13 => Seq("-Xsource:2.14")
case _ => Seq("-Yno-adapted-args", "-Ywarn-unused-import")
})
},
scalacOptions in Test += "-Yrangepos"
)

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")

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

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

0 comments on commit 59f4cc8

Please sign in to comment.