diff --git a/build.sbt b/build.sbt index 13967093e..8ffc7af76 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -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 => diff --git a/project/plugins.sbt b/project/plugins.sbt index d480a08a5..1548338a0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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"