@@ -41,7 +41,7 @@ lazy val commonSettings = Seq(
41
41
" -unchecked"
42
42
) ++ (CrossVersion .partialVersion(scalaVersion.value) match {
43
43
case Some ((3 , _)) => Seq (" -language:Scala2,implicitConversions" )
44
- case Some ((2 , x)) if x == 11 => Seq (" -Ybackend:GenBCode" , " -Ydelambdafy:method" , " -target:jvm-1.8" )
44
+ case Some ((2 , 11 )) => Seq (" -Ybackend:GenBCode" , " -Ydelambdafy:method" , " -target:jvm-1.8" )
45
45
case _ => Seq (" -target:jvm-1.8" )
46
46
}),
47
47
Test / testOptions += Tests .Argument (" -oDF" ),
@@ -111,21 +111,21 @@ lazy val `rtree2d-core` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
111
111
" org.scalatestplus" %%% " scalacheck-1-15" % " 3.2.4.0-M1" % Test
112
112
)
113
113
case _=> Seq (
114
- " org.scalatest" %%% " scalatest" % " 3.2.7 " % Test ,
115
- " org.scalatestplus" %%% " scalacheck-1-15" % " 3.2.7 .0" % Test
114
+ " org.scalatest" %%% " scalatest" % " 3.2.8 " % Test ,
115
+ " org.scalatestplus" %%% " scalacheck-1-15" % " 3.2.8 .0" % Test
116
116
)
117
117
})
118
118
)
119
119
.nativeSettings(
120
120
crossScalaVersions := Seq (" 2.13.5" , scalaVersion.value),
121
121
)
122
122
.jsSettings(
123
- crossScalaVersions := Seq (" 2.13.5" , scalaVersion.value, " 2.11.12" ),
123
+ crossScalaVersions := Seq (" 3.0.0-RC3 " , " 2.13.5" , scalaVersion.value, " 2.11.12" ),
124
124
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind .CommonJSModule ).withESFeatures(_.withUseECMAScript2015(false ))),
125
125
coverageEnabled := false // FIXME: No support for Scala.js 1.0 yet, see https://github.com/scoverage/scalac-scoverage-plugin/pull/287
126
126
)
127
127
.jvmSettings(
128
- crossScalaVersions := Seq (" 3.0.0-RC2 " , " 2.13.5" , scalaVersion.value, " 2.11.12" )
128
+ crossScalaVersions := Seq (" 3.0.0-RC3 " , " 2.13.5" , scalaVersion.value, " 2.11.12" )
129
129
)
130
130
131
131
lazy val `rtree2d-coreJVM` = `rtree2d-core`.jvm
@@ -145,7 +145,7 @@ lazy val `rtree2d-benchmark` = project
145
145
" org.locationtech.jts" % " jts-core" % " 1.18.1" ,
146
146
" com.github.davidmoten" % " rtree2" % " 0.9-RC1" ,
147
147
" org.spire-math" %% " archery" % " 0.6.0" ,
148
- " org.scalatest" %% " scalatest" % " 3.2.7 " % Test
148
+ " org.scalatest" %% " scalatest" % " 3.2.8 " % Test
149
149
),
150
150
charts := Def .inputTaskDyn {
151
151
val jmhParams = Def .spaceDelimited().parsed
0 commit comments