Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue authored Mar 5, 2024
2 parents af19a1e + d2b4c9d commit 8615caf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ commands += Command.command("testStaging") { state =>
}

// Keep in sync with TestCli
val scala212 = "2.12.18"
val scala212 = "2.12.19"
val scala213 = "2.13.13"
val scala3 = "3.3.1"

Expand All @@ -53,7 +53,7 @@ val root = project.in(file(".")).settings(
)
aggregateProjects(core.jvm, core.native, sbtplugin, functionalTests)

val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.0-M10")
val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.0-M11")

val core = crossProject(JVMPlatform, NativePlatform).crossType(CrossType.Pure).settings(
name := "mima-core",
Expand Down Expand Up @@ -91,7 +91,7 @@ val functionalTests = Project("functional-tests", file("functional-tests"))
.configs(IntegrationTest)
.settings(
crossScalaVersions += scala213,
libraryDependencies += "io.get-coursier" %% "coursier" % "2.1.8",
libraryDependencies += "io.get-coursier" %% "coursier" % "2.1.9",
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
libraryDependencies += munit.value,
testFrameworks += new TestFramework("munit.Framework"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import scala.util.{ Properties => StdLibProps }
object TestCli {
// Keep in sync with build.sbt
val scala211 = "2.11.12"
val scala212 = "2.12.18"
val scala212 = "2.12.19"
val scala213 = "2.13.13"
val scala3 = "3.3.1"
val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get
Expand Down

0 comments on commit 8615caf

Please # to comment.