Skip to content

Commit ec8893b

Browse files
committed
Update Scala 3.x to 3.0.0-RC2 and Scala 2.13.x to 2.13.5
1 parent 60672bb commit ec8893b

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Sbt
22
target/
3+
.bsp
34

45
# Idea
56
.idea/

build.sbt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,24 @@ lazy val `rtree2d-core` = crossProject(JVMPlatform, JSPlatform)
9999
.settings(commonSettings)
100100
.settings(publishSettings)
101101
.settings(
102-
libraryDependencies ++= Seq(
103-
"org.scalatest" %%% "scalatest" % "3.2.4-M1" % Test,
104-
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.4.0-M1" % Test
105-
)
102+
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
103+
case Some((2, 11)) => Seq(
104+
"org.scalatest" %%% "scalatest" % "3.2.3" % Test,
105+
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.3.0" % Test
106+
)
107+
case _=> Seq(
108+
"org.scalatest" %%% "scalatest" % "3.2.7" % Test,
109+
"org.scalatestplus" %%% "scalacheck-1-15" % "3.2.7.0" % Test
110+
)
111+
})
106112
)
107113
.jsSettings(
108-
crossScalaVersions := Seq("2.13.3", scalaVersion.value, "2.11.12"),
114+
crossScalaVersions := Seq("2.13.5", scalaVersion.value, "2.11.12"),
109115
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule).withESFeatures(_.withUseECMAScript2015(false))),
110116
coverageEnabled := false // FIXME: No support for Scala.js 1.0 yet, see https://github.com/scoverage/scalac-scoverage-plugin/pull/287
111117
)
112118
.jvmSettings(
113-
crossScalaVersions := Seq("3.0.0-M3", "2.13.3", scalaVersion.value, "2.11.12")
119+
crossScalaVersions := Seq("3.0.0-RC2", "2.13.5", scalaVersion.value, "2.11.12")
114120
)
115121

116122
lazy val `rtree2d-coreJVM` = `rtree2d-core`.jvm

0 commit comments

Comments
 (0)