Skip to content

Commit

Permalink
Update Scala versions
Browse files Browse the repository at this point in the history
  • Loading branch information
lrytz committed Jun 11, 2021
1 parent af30fff commit cf96d38
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
16 changes: 5 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,31 @@ jobs:
name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"
script: scripts/test-code.sh
env:
- SCALA_VERSION=2.12.13
- SCALA_VERSION=2.12.14
- TRAVIS_JDK=11

- name: "Run tests with Scala 2.13 and AdoptOpenJDK 11"
script: scripts/test-code.sh
env:
- SCALA_VERSION=2.13.5
- SCALA_VERSION=2.13.6
- TRAVIS_JDK=11

- name: "Run tests with Scala 2.12 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- SCALA_VERSION=2.12.13
- SCALA_VERSION=2.12.14
- TRAVIS_JDK=8

- name: "Run tests with Scala 2.13 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- SCALA_VERSION=2.13.5
- SCALA_VERSION=2.13.6
- TRAVIS_JDK=8

- name: "Run tests with Scala 3 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- 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-RC3
- SCALA_VERSION=3.0.0
- 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 @@ -95,7 +95,7 @@ val scalacOpts = Seq(
"-Ywarn-macros:after"
)

val silencerVersion = "1.7.3"
val silencerVersion = "1.7.5"

ThisBuild / libraryDependencies ++= {
if (isScala3.value) Nil
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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-RC2", "3.0.0-RC3")
val Scala212 = "2.12.14"
val Scala213 = "2.13.6"
val Scala3 = Seq("3.0.0")
}

0 comments on commit cf96d38

Please sign in to comment.