@@ -33,7 +33,7 @@ ThisBuild / homepage := Some(
33
33
val scala211 = " 2.11.12"
34
34
val scala212 = " 2.12.13"
35
35
val scala213 = " 2.13.5"
36
- val scala3 = " 3.0.0-RC1 "
36
+ val scala3 = " 3.0.0-RC3 "
37
37
38
38
scalaVersion := scala213
39
39
@@ -78,23 +78,23 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
78
78
" io.cucumber" % " cucumber-core" % cucumberVersion,
79
79
// Users have to provide it (for JacksonDefaultDataTableTransformer)
80
80
(" com.fasterxml.jackson.module" %% " jackson-module-scala" % jacksonVersion % Provided )
81
- .withDottyCompat(scalaVersion.value ),
81
+ .cross( CrossVersion .for3Use2_13 ),
82
82
" junit" % " junit" % junitVersion % Test ,
83
83
" io.cucumber" % " cucumber-junit" % cucumberVersion % Test ,
84
84
(" org.mockito" %% " mockito-scala" % mockitoScalaVersion % Test )
85
- .withDottyCompat(scalaVersion.value )
85
+ .cross( CrossVersion .for3Use2_13 )
86
86
),
87
87
libraryDependencies ++= {
88
88
CrossVersion .partialVersion(scalaVersion.value) match {
89
89
case Some ((2 , n)) if n <= 12 =>
90
90
List (" org.scala-lang.modules" %% " scala-collection-compat" % " 2.4.2" )
91
91
case Some ((3 , 0 )) =>
92
- List (" io.github.gaeljw" %% " typetrees" % " 0.2 .0" )
92
+ List (" io.github.gaeljw" %% " typetrees" % " 0.4 .0" )
93
93
case _ => Nil
94
94
}
95
95
},
96
- unmanagedSourceDirectories in Compile ++= {
97
- val sourceDir = (sourceDirectory in Compile ).value
96
+ Compile / unmanagedSourceDirectories ++= {
97
+ val sourceDir = (Compile / sourceDirectory ).value
98
98
CrossVersion .partialVersion(scalaVersion.value) match {
99
99
case Some ((2 , n)) if n <= 11 =>
100
100
Seq (sourceDir / " scala-2" , sourceDir / " scala-2.11" )
@@ -106,8 +106,8 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
106
106
Seq ()
107
107
}
108
108
},
109
- unmanagedSourceDirectories in Test ++= {
110
- val testSourceDir = (sourceDirectory in Test ).value
109
+ Test / unmanagedSourceDirectories ++= {
110
+ val testSourceDir = (Test / sourceDirectory ).value
111
111
CrossVersion .partialVersion(scalaVersion.value) match {
112
112
case Some ((2 , _)) =>
113
113
Seq (testSourceDir / " scala-2" )
0 commit comments