Skip to content

Commit

Permalink
Merge pull request #797 from mkurz/play29M2
Browse files Browse the repository at this point in the history
Play 2.9 milestone
  • Loading branch information
mkurz authored Oct 10, 2022
2 parents e2180a9 + 8576ed7 commit 582c2b6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ lazy val commonSettings = Def.settings(
Tests.Argument(TestFrameworks.ScalaTest, "-l", "play.api.libs.json.UnstableInScala213")
),
headerLicense := Some(HeaderLicense.Custom(s"Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>")),
scalaVersion := Dependencies.Scala212,
scalaVersion := Dependencies.Scala213,
crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
Compile / javacOptions ++= javacSettings,
Test / javacOptions ++= javacSettings,
Expand Down
6 changes: 5 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/

lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0
)

resolvers ++= DefaultOptions.resolvers(snapshot = true)
resolvers += Resolver.typesafeRepo("releases")

addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.16"))
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M2"))

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")

Expand Down
3 changes: 2 additions & 1 deletion scripts/test-code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ echo MATRIX_SCALA=$MATRIX_SCALA
sbt -DscalaJSStage=full ++$MATRIX_SCALA test publishLocal || exit 1

case "$MATRIX_SCALA" in
3.*) echo "SKIPPING docs/test" ;;
3.* | 2.12.*) echo "SKIPPING docs/test" ;;
# ^ because Play 2.9.x does not get published for Scala 2.12.x anymore
# ^ because there is no play-docs for Scala 3
# and we can't use play-docs_2.13 because then:
# [error] Modules were resolved with conflicting cross-version suffixes in ProjectRef(uri("file:/d/play-json/"), "docs"):
Expand Down

0 comments on commit 582c2b6

Please sign in to comment.