Skip to content

Commit

Permalink
Merge pull request #602 from SethTisue/scala-3.0.0-RC3
Browse files Browse the repository at this point in the history
support Scala 3.0.0-RC3 (and drop RC1)
  • Loading branch information
SethTisue authored Apr 21, 2021
2 parents 878aa53 + 56c28f9 commit 22c8532
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ jobs:
- name: "Run tests with Scala 3 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- SCALA_VERSION=3.0.0-RC1
- SCALA_VERSION=3.0.0-RC2
- TRAVIS_JDK=8

- name: "Run tests with Scala 3 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- SCALA_VERSION=3.0.0-RC2
- SCALA_VERSION=3.0.0-RC3
- TRAVIS_JDK=8

- stage: publish
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform)
),
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % "3.2.8" % Test,
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.7.0" % Test,
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.8.0" % Test,
"org.scalacheck" %%% "scalacheck" % "1.15.3" % Test,
).map(_.cross(CrossVersion.for3Use2_13)),
libraryDependencies += {
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ object Dependencies {
// scalaVersion needs to be kept in sync with travis-ci
val Scala212 = "2.12.13"
val Scala213 = "2.13.5"
val Scala3 = Seq("3.0.0-RC1", "3.0.0-RC2")
val Scala3 = Seq("3.0.0-RC2", "3.0.0-RC3")
}

0 comments on commit 22c8532

Please sign in to comment.