Skip to content

Commit

Permalink
Merge pull request #1902 from scalacenter/update/sbt-version-policy-3…
Browse files Browse the repository at this point in the history
….2.0

Update sbt-version-policy to 3.2.0
  • Loading branch information
bjaglin committed Feb 10, 2024
2 parents 16e9dce + b7df882 commit 61dce03
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
23 changes: 7 additions & 16 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,13 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {

override def buildSettings: Seq[Setting[_]] = List(
// https://github.com/sbt/sbt/issues/5568#issuecomment-1094380636
versionPolicyIgnored += "com.lihaoyi" %% "pprint",
versionPolicyIgnored ++= Seq(
// https://github.com/scalacenter/scalafix/pull/1530
"com.lihaoyi" %% "pprint",
// https://github.com/scalacenter/scalafix/pull/1819#issuecomment-1636118496
"org.scalameta" %% "fastparse-v2",
"com.lihaoyi" %% "geny"
),
versionPolicyIgnoredInternalDependencyVersions :=
Some("^\\d+\\.\\d+\\.\\d+\\+\\d+".r),
versionScheme := Some("early-semver"),
Expand All @@ -248,21 +254,6 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
)

override def projectSettings: Seq[Def.Setting[_]] = List(
// https://github.com/scalacenter/scalafix/pull/1819#issuecomment-1636118496
versionPolicyFindDependencyIssues ~= { issues =>
issues.map { case (module, report) =>
val Seq(backward, forward) =
Seq(report.backwardStatuses, report.forwardStatuses)
.map { statuses =>
statuses.filterNot { case ((org, artifact), _) =>
Seq(scalametaFastparse, geny)
.map(mod => (mod.organization, mod.name))
.contains((org, artifact.split('_').head))
}
}
(module, DependencyCheckReport(backward, forward))
}
},
// Prevent issues with scalatest serialization
Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat,
Test / testWindows := (Test / testOnly)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "2.1.3")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
Expand Down

0 comments on commit 61dce03

Please sign in to comment.