Skip to content

Commit

Permalink
Merge pull request #801 from scala-steward/update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
Update scala-library, scala-reflect to 2.13.13
  • Loading branch information
SethTisue committed Mar 19, 2024
2 parents 3879411 + cd5287c commit 6fa2a84
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
9 changes: 7 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@ def compilerOptions(scalaVersion: String): Seq[String] =
) ++
(CrossVersion.partialVersion(scalaVersion) match {
case Some((2, _)) => Seq(
"-Xsource:3", "-Xlint",
"-Xlint",
// these are too annoying when crossbuilding
"-Wconf:cat=unused-nowarn:s",
)
case _ => Seq()
}) ++
(CrossVersion.partialVersion(scalaVersion) match {
case Some((2, 12)) => Seq("-Xsource:3")
case Some((2, 13)) => Seq("-Xsource:3-cross")
case _ => Seq()
})

// Useful to self-test releases
Expand All @@ -42,7 +47,7 @@ commands += Command.command("testStaging") { state =>

// Keep in sync with TestCli
val scala212 = "2.12.19"
val scala213 = "2.13.12"
val scala213 = "2.13.13"
val scala3 = "3.3.3"

val root = project.in(file(".")).settings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object TestCli {
// Keep in sync with build.sbt
val scala211 = "2.11.12"
val scala212 = "2.12.19"
val scala213 = "2.13.12"
val scala213 = "2.13.13"
val scala3 = "3.3.3"
val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get
val allScalaVersions = List(scala211, scala212, scala213, scala3)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-Xsource:3
-Wconf:cat=scala3-migration:s
-Xsource:3-cross
-Wconf:cat=scala3-migration:s
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ organization := "com.typesafe"
name := "pom-only-project"
version := "1.1.0"
mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0")
scalaVersion := "2.13.12"
scalaVersion := "2.13.13"

// this is an arbitrary dependency, but one that's known to cause issues in POM-only projects
// see https://github.com/lightbend/mima/issues/768 for more context
Expand Down

0 comments on commit 6fa2a84

Please sign in to comment.