Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ lazy val interfaces = project
// Scala 3 macros vendored separately (i.e. without runtime classes), to
// shadow Scala 2.13 macros in the Scala 3 compiler classpath, while producing
// code valid against Scala 2.13 bytecode
// TODO: after replacing with metaconfig_3, remove -Wconf filter in ScalafixBuild
lazy val `compat-metaconfig-macros` = projectMatrix
.settings(
libraryDependencies += metaconfig cross CrossVersion.for3Use2_13
Expand Down Expand Up @@ -251,6 +252,7 @@ lazy val input = projectMatrix
scalacOptions ~= (_.filterNot(_ == "-Yno-adapted-args")),
scalacOptions ++= warnAdaptedArgs.value, // For NoAutoTupling
logLevel := Level.Error, // avoid flood of compiler warnings
scalacOptions --= ScalafixBuild.werrorOptions,
libraryDependencies ++= testsDependencies.value,
coverageEnabled := false,
allowUnsafeScalaLibUpgrade := true,
Expand All @@ -275,6 +277,7 @@ lazy val output = projectMatrix
.settings(
noPublishAndNoMima,
logLevel := Level.Error, // avoid flood of compiler warnings
scalacOptions --= ScalafixBuild.werrorOptions,
libraryDependencies ++= testsDependencies.value,
coverageEnabled := false,
// mimic dependsOn(shared) but allowing binary Scala version matching
Expand Down Expand Up @@ -325,6 +328,7 @@ lazy val integration = projectMatrix
.settings(
noPublishAndNoMima,
Test / parallelExecution := false,
scalacOptions --= ScalafixBuild.werrorOptions,
libraryDependencies ++= {
if (!isScala3.value) {
Seq(
Expand Down
18 changes: 15 additions & 3 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import sbtversionpolicy.SbtVersionPolicyPlugin
import sbtversionpolicy.SbtVersionPolicyPlugin.autoImport._
import scalafix.sbt.ScalafixPlugin.autoImport._
import com.github.sbt.sbtghpages.GhpagesKeys
import sbt.librarymanagement.ivy.IvyDependencyResolution
import sbt.plugins.IvyPlugin
import sbtversionpolicy.DependencyCheckReport
import scala.util.Try

object ScalafixBuild extends AutoPlugin with GhpagesKeys {
Expand Down Expand Up @@ -290,6 +287,14 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
}
},
versionPolicyIntention := Compatibility.BinaryCompatible,
scalacOptions ++= werrorOptions,
scalacOptions ++= Seq( // exclusions
"-Wconf:cat=deprecation&msg=Rule:s",
"-Wconf:cat=deprecation&msg=JavaConverters:s",
"-Wconf:cat=deprecation&msg=AssociatedComments:s",
// TODO: remove after replacing compat-metaconfig-macros with proper metaconfig
"-Wconf:msg=.*Toplevel definition .* is defined in.*:s"
),
scalacOptions += "-Wconf:origin=scala.collection.compat.*:s",
scalacOptions ++= compilerOptions.value,
scalacOptions ++= {
Expand Down Expand Up @@ -382,4 +387,11 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {

private def asProjectSuffix(scalaVersion: String) =
scalaVersion.replaceAll("[\\.-]", "_")

val werrorOptions = Seq(
"-Werror",
"-deprecation",
"-Wconf:cat=deprecation:error"
)

}
Loading