Skip to content

Commit

Permalink
Merge pull request #2130 from scalacenter/update/sbt-projectmatrix-0.…
Browse files Browse the repository at this point in the history
…10.1

Update sbt-projectmatrix to 0.10.1
  • Loading branch information
bjaglin authored Dec 1, 2024
2 parents 43acd9b + cbfb123 commit 7c60583
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
21 changes: 4 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,6 @@ lazy val rules = projectMatrix
"org.scala-lang" %% "scala3-presentation-compiler" % scalaVersion.value,
coursierInterfaces
)
},
// companion of `.dependsOn(core)`
// issue reported in https://github.com/sbt/sbt/issues/7405
// using workaround from https://github.com/sbt/sbt/issues/5369#issue-549758513
projectDependencies := {
projectDependencies.value.map {
case core
if core.name == "scalafix-core" && scalaBinaryVersion.value == "3" =>
core
.withName("scalafix-core_2.13")
.withCrossVersion(CrossVersion.disabled)
case dep =>
dep
}
}
)
.defaultAxes(VirtualAxis.jvm)
Expand Down Expand Up @@ -208,11 +194,12 @@ lazy val cli = projectMatrix
// companion of `.dependsOn(reflect)`
// issue reported in https://github.com/sbt/sbt/issues/7405
// using workaround from https://github.com/sbt/sbt/issues/5369#issue-549758513
// https://github.com/sbt/sbt-projectmatrix/pull/97 only fixed dependencies to binary versions
projectDependencies := {
projectDependencies.value.map {
case core
if core.name == "scalafix-reflect" && scalaBinaryVersion.value == "3" =>
core
case reflect
if reflect.name == "scalafix-reflect" && scalaBinaryVersion.value == "3" =>
reflect
.withName(s"scalafix-reflect_${scala213}")
.withCrossVersion(CrossVersion.disabled)
case dep =>
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1")

// https://github.com/scala/bug/issues/12632
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"

0 comments on commit 7c60583

Please sign in to comment.