Skip to content

Commit a5a6ebe

Browse files
authored
Merge pull request #205 from cucumber/scala3rc3
Scala3 RC3
2 parents b8e75d3 + 991656a commit a5a6ebe

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ThisBuild / homepage := Some(
3333
val scala211 = "2.11.12"
3434
val scala212 = "2.12.13"
3535
val scala213 = "2.13.5"
36-
val scala3 = "3.0.0-RC1"
36+
val scala3 = "3.0.0-RC3"
3737

3838
scalaVersion := scala213
3939

@@ -78,23 +78,23 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
7878
"io.cucumber" % "cucumber-core" % cucumberVersion,
7979
// Users have to provide it (for JacksonDefaultDataTableTransformer)
8080
("com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided)
81-
.withDottyCompat(scalaVersion.value),
81+
.cross(CrossVersion.for3Use2_13),
8282
"junit" % "junit" % junitVersion % Test,
8383
"io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
8484
("org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test)
85-
.withDottyCompat(scalaVersion.value)
85+
.cross(CrossVersion.for3Use2_13)
8686
),
8787
libraryDependencies ++= {
8888
CrossVersion.partialVersion(scalaVersion.value) match {
8989
case Some((2, n)) if n <= 12 =>
9090
List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2")
9191
case Some((3, 0)) =>
92-
List("io.github.gaeljw" %% "typetrees" % "0.2.0")
92+
List("io.github.gaeljw" %% "typetrees" % "0.4.0")
9393
case _ => Nil
9494
}
9595
},
96-
unmanagedSourceDirectories in Compile ++= {
97-
val sourceDir = (sourceDirectory in Compile).value
96+
Compile / unmanagedSourceDirectories ++= {
97+
val sourceDir = (Compile / sourceDirectory).value
9898
CrossVersion.partialVersion(scalaVersion.value) match {
9999
case Some((2, n)) if n <= 11 =>
100100
Seq(sourceDir / "scala-2", sourceDir / "scala-2.11")
@@ -106,8 +106,8 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
106106
Seq()
107107
}
108108
},
109-
unmanagedSourceDirectories in Test ++= {
110-
val testSourceDir = (sourceDirectory in Test).value
109+
Test / unmanagedSourceDirectories ++= {
110+
val testSourceDir = (Test / sourceDirectory).value
111111
CrossVersion.partialVersion(scalaVersion.value) match {
112112
case Some((2, _)) =>
113113
Seq(testSourceDir / "scala-2")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.7
1+
sbt.version=1.5.1

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "7.0.0-SNAPSHOT"
1+
ThisBuild / version := "7.0.0-SNAPSHOT"

0 commit comments

Comments
 (0)