Skip to content

Commit fac5678

Browse files
committed
Add Scala 3 support for rtree2d-coreJS + update Scala 3.x to 3.0.0-RC3 + update scalatest to 3.2.8 + update scalacheck-1-15 to 3.2.8.0
1 parent 0e698e7 commit fac5678

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ lazy val commonSettings = Seq(
4141
"-unchecked"
4242
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
4343
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")
4545
case _ => Seq("-target:jvm-1.8")
4646
}),
4747
Test / testOptions += Tests.Argument("-oDF"),
@@ -111,21 +111,21 @@ lazy val `rtree2d-core` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
111111
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.4.0-M1" % Test
112112
)
113113
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
116116
)
117117
})
118118
)
119119
.nativeSettings(
120120
crossScalaVersions := Seq("2.13.5", scalaVersion.value),
121121
)
122122
.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"),
124124
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule).withESFeatures(_.withUseECMAScript2015(false))),
125125
coverageEnabled := false // FIXME: No support for Scala.js 1.0 yet, see https://github.com/scoverage/scalac-scoverage-plugin/pull/287
126126
)
127127
.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")
129129
)
130130

131131
lazy val `rtree2d-coreJVM` = `rtree2d-core`.jvm
@@ -145,7 +145,7 @@ lazy val `rtree2d-benchmark` = project
145145
"org.locationtech.jts" % "jts-core" % "1.18.1",
146146
"com.github.davidmoten" % "rtree2" % "0.9-RC1",
147147
"org.spire-math" %% "archery" % "0.6.0",
148-
"org.scalatest" %% "scalatest" % "3.2.7" % Test
148+
"org.scalatest" %% "scalatest" % "3.2.8" % Test
149149
),
150150
charts := Def.inputTaskDyn {
151151
val jmhParams = Def.spaceDelimited().parsed

0 commit comments

Comments
 (0)