Skip to content

Commit 40bb629

Browse files
authored
Merge pull request #273 from kitbellew/273
SBT: treat warnings as errors
2 parents b5e0494 + c6a9439 commit 40bb629

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

build.sbt

+12
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ lazy val sharedSettings = Def.settings(
8383
else "-Ywarn-unused-import"
8484
},
8585
scalacOptions += "-deprecation",
86+
scalacOptions += "-Xfatal-warnings",
87+
scalacOptions ++= {
88+
if (isScala213.value) "-Wconf:cat=deprecation:is" :: Nil
89+
else if (isScala3.value) "-Wconf:cat=deprecation:silent" :: Nil
90+
else Nil
91+
},
92+
scalacOptions ++= {
93+
if (isScala3.value) Nil else "-Wconf:cat=feature:is" :: Nil
94+
},
8695
mimaBinaryIssueFilters += languageAgnosticCompatibilityPolicy,
8796
crossScalaVersions := ScalaVersions,
8897
scalaVersion := scala213,
@@ -207,6 +216,9 @@ lazy val docs = project.in(file("metaconfig-docs")).settings(
207216
"org.scalameta" %%% "munit-scalacheck" % V.munit % Test,
208217
),
209218
publish / skip := true,
219+
dependencyOverrides +=
220+
"org.scalameta" %% "metaconfig-typesafe-config" % (ThisBuild / version)
221+
.value,
210222
moduleName := "metaconfig-docs",
211223
mdocVariables := Map(
212224
"VERSION" -> version.value.replaceFirst("\\+.*", ""),

metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ object TPrintLowPri {
124124
val pre = rec(tpe)
125125
lazy val defs = fansi.Str.join(
126126
refinements.collect {
127-
case (name, tpe: TypeRepr) => fansi.Str("type " + name + " = ") ++
128-
rec(tpe)
129127
case (name, TypeBounds(lo, hi)) => fansi.Str("type " + name) ++
130128
printBounds(lo, hi) ++ rec(tpe)
129+
case (name, tpe: TypeRepr) => fansi.Str("type " + name + " = ") ++
130+
rec(tpe)
131131
},
132132
sep = "; ",
133133
)

metaconfig-tests/shared/src/test/scala/metaconfig/ConfDynamicSuite.scala

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ class ConfDynamicSuite extends munit.FunSuite {
1919
assert(conf.dynamic.x.c.d.e.asConf.isNotOk)
2020
}
2121
test("did you mean?") {
22-
val Configured.NotOk(err) = conf.dynamic.banna.asConf
23-
assert(err.toString.contains("Did you mean 'banana'"))
22+
conf.dynamic.banna.asConf match {
23+
case Configured.NotOk(err) =>
24+
assert(err.toString.contains("Did you mean 'banana'"))
25+
case Configured.Ok(value) =>
26+
fail("Expected \"Did you mean 'banana'\" error")
27+
}
2428
}
2529
}

0 commit comments

Comments
 (0)