Skip to content

Scala3 RC3 #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2021
Merged

Scala3 RC3 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f111f6
chore: 🤖 Target Scala 3 RC3
gaeljw May 1, 2021
991656a
chore: 🤖 Use sbt 1.5.1
gaeljw May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ThisBuild / homepage := Some(
val scala211 = "2.11.12"
val scala212 = "2.12.13"
val scala213 = "2.13.5"
val scala3 = "3.0.0-RC1"
val scala3 = "3.0.0-RC3"

scalaVersion := scala213

Expand Down Expand Up @@ -78,23 +78,23 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
"io.cucumber" % "cucumber-core" % cucumberVersion,
// Users have to provide it (for JacksonDefaultDataTableTransformer)
("com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided)
.withDottyCompat(scalaVersion.value),
.cross(CrossVersion.for3Use2_13),
"junit" % "junit" % junitVersion % Test,
"io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
("org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test)
.withDottyCompat(scalaVersion.value)
.cross(CrossVersion.for3Use2_13)
),
libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n <= 12 =>
List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2")
case Some((3, 0)) =>
List("io.github.gaeljw" %% "typetrees" % "0.2.0")
List("io.github.gaeljw" %% "typetrees" % "0.4.0")
case _ => Nil
}
},
unmanagedSourceDirectories in Compile ++= {
val sourceDir = (sourceDirectory in Compile).value
Compile / unmanagedSourceDirectories ++= {
val sourceDir = (Compile / sourceDirectory).value
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n <= 11 =>
Seq(sourceDir / "scala-2", sourceDir / "scala-2.11")
Expand All @@ -106,8 +106,8 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
Seq()
}
},
unmanagedSourceDirectories in Test ++= {
val testSourceDir = (sourceDirectory in Test).value
Test / unmanagedSourceDirectories ++= {
val testSourceDir = (Test / sourceDirectory).value
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, _)) =>
Seq(testSourceDir / "scala-2")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.7
sbt.version=1.5.1
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "7.0.0-SNAPSHOT"
ThisBuild / version := "7.0.0-SNAPSHOT"