Skip to content

Commit

Permalink
sandwich workarounds: remove obsolete & comment remaining
Browse files Browse the repository at this point in the history
  • Loading branch information
bjaglin committed Dec 1, 2024
1 parent 323d187 commit cbfb123
Showing 1 changed file with 4 additions and 17 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

0 comments on commit cbfb123

Please sign in to comment.