Skip to content

Commit 1ba2d3f

Browse files
authored
Merge pull request #678 from adpi2/update-scala-versions
Update Scala versions
2 parents c21d07f + e5e63ee commit 1ba2d3f

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

build.sbt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,10 @@ lazy val expressionCompiler = projectMatrix
165165
crossScalaVersions ++= CrossVersion
166166
.partialVersion(scalaVersion.value)
167167
.collect {
168-
case (2, 12) => Seq("2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13", "2.12.12", "2.12.11")
169-
case (2, 13) => Seq("2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4")
168+
case (2, 12) =>
169+
Seq("2.12.19", "2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13", "2.12.12", "2.12.11")
170+
case (2, 13) =>
171+
Seq("2.13.13", "2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4")
170172
case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0")
171173
case (3, 1 | 2 | 3) =>
172174
Seq("3.3.2", "3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0")
@@ -207,10 +209,10 @@ lazy val decoder3: Project = project
207209
.dependsOn(tests3 % Test)
208210
.settings(
209211
name := "scala-debug-decoder",
210-
scalaVersion := Dependencies.scala33,
212+
scalaVersion := Dependencies.scala34,
211213
Compile / doc / sources := Seq.empty,
212214
libraryDependencies ++= Seq(
213-
"ch.epfl.scala" %% "tasty-query" % "1.2.1",
215+
"ch.epfl.scala" %% "tasty-query" % "1.3.0",
214216
Dependencies.asm,
215217
Dependencies.asmUtil,
216218
Dependencies.munit % Test

modules/sbt-plugin/src/sbt-test/debug-session/scala-collection-compat/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ch.epfl.scala.debugadapter.testfmk._
22
import ch.epfl.scala.debugadapter.DebugConfig
33

44
val scalaCollectionCompat = inputKey[Unit]("Check the presence of scala-collection-compat")
5-
val scalaV = "2.12.18"
5+
val scalaV = "2.12.19"
66

77
def checkScalaCollectionCompat = Def.inputTask {
88
val uri = (Compile / startMainClassDebugSession).evaluated

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import sbt._
22

33
object Dependencies {
44
val scalaEnvVersion = Option(System.getenv("SCALA_VERSION"))
5-
val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.18")
6-
val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.12")
5+
val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.19")
6+
val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.13")
77
val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
88
val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.2")
99
val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0")

0 commit comments

Comments
 (0)