Skip to content

Commit 5fd1bdf

Browse files
authored
add Scala 3.0.0-RC3 to crossbuild (#127)
1 parent 1f2fce9 commit 5fd1bdf

File tree

4 files changed

+12
-38
lines changed

4 files changed

+12
-38
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
java: [8, 11]
13-
scala: [2.12.13, 2.13.5, 3.0.0-RC2]
13+
scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2

.travis.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Lightbend Emoji is a wrapper around Java's Unicode handling.
77

88
## Installation
99

10-
Supported Scala versions: 2.12, 2.13, 3.0.0-RC2
10+
Supported Scala versions: 2.12, 2.13, 3.0.0-RC2, 3.0.0-RC3
1111

1212
Add to `build.sbt`:
1313

build.sbt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,18 @@ ThisBuild / versionScheme := Some("early-semver")
1919

2020
/// build
2121

22-
crossScalaVersions := Seq("2.13.5", "2.12.13", "3.0.0-RC2")
22+
crossScalaVersions := Seq("2.13.5", "2.12.13", "3.0.0-RC2", "3.0.0-RC3")
2323
scalaVersion := crossScalaVersions.value.head
2424

25-
libraryDependencies ++= Seq(
26-
"org.scalatest" %% "scalatest-wordspec" % "3.2.7" % Test,
27-
"org.scalatest" %% "scalatest-shouldmatchers" % "3.2.7" % Test,
28-
)
25+
libraryDependencies ++= {
26+
val scalaTestVersion =
27+
if (scalaVersion.value == "3.0.0-RC2") "3.2.7"
28+
else "3.2.8"
29+
Seq(
30+
"org.scalatest" %% "scalatest-wordspec" % scalaTestVersion % Test,
31+
"org.scalatest" %% "scalatest-shouldmatchers" % scalaTestVersion % Test,
32+
)
33+
}
2934

3035
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings") ++ (
3136
CrossVersion.partialVersion(scalaVersion.value) match {

0 commit comments

Comments
 (0)