Skip to content

Commit f58ceb9

Browse files
SethTisueSethTisue
committed
-Xmigration is no longer overloaded to un-errorize warnings
1 parent 1748a88 commit f58ceb9

25 files changed

+3
-58
lines changed

‎proj/airframe.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ vars.proj.airframe: ${vars.base} {
66

77
extra.projects: ["communityBuild"] // no Scala.js plz
88
extra.commands: ${vars.default-commands} [
9-
"appendScalacOptions -Xmigration"
109
// just compile the tests in the ulid subproject, don't run them; see
1110
// https://github.com/scala/community-build/pull/1425 (June 2021)
1211
"set ulid.jvm / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"

‎proj/ammonite.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ vars.proj.ammonite: ${vars.base} {
1515
// doesn't seem worth investigating, we don't need to run every last test
1616
"""set repl / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "SourceTests.scala""""
1717
"""set amm / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "AmmoniteBuildServerTests.scala" || "MainTests.scala""""
18-
// because scala/scala#10439, until maintainers move to 2.13.12
19-
"appendScalacOptions -Xmigration"
2018
]
2119
}

‎proj/blaze.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ vars.proj.blaze: ${vars.base} {
55
uri: "https://github.com/http4s/blaze.git#1f10e5865da3181ac8b41a6d14e3f7b9387e225b"
66

77
extra.commands: ${vars.default-commands} [
8-
"appendScalacOptions -Xmigration"
98
"set every gpgWarnOnFailure := true"
109
"removeJavacOptions --release 8"
1110
// so we don't have to arrange for dbuild-built semanticdb to be brought in

‎proj/cats-effect.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ vars.proj.cats-effect: ${vars.base} {
1212
"""set every Jcstress / version := "0.16""""
1313
// otherwise sbt-gpg errors on `publish`
1414
"set every gpgWarnOnFailure := true"
15-
// because scala/scala#10439, until maintainers move to 2.13.12
16-
"appendScalacOptions -Xmigration"
1715
]
1816
}

‎proj/cats-parse.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ vars.proj.cats-parse: ${vars.base} {
1212
]
1313
extra.commands: ${vars.default-commands} [
1414
"set every gpgWarnOnFailure := true"
15-
// because scala/scala#10439, until maintainers move to 2.13.12
16-
"appendScalacOptions -Xmigration"
1715
]
1816
}

‎proj/cats.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ vars.proj.cats: ${vars.base} {
1313
extra.commands: ${vars.default-commands} [
1414
// intermittent failures
1515
"""set tests.jvm / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ApplicativeSuite.scala""""
16-
// because scala/scala#10439, until maintainers move to 2.13.12
17-
"appendScalacOptions -Xmigration"
1816
]
1917
}

‎proj/chimney.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ vars.proj.chimney: ${vars.base} {
55
uri: "https://github.com/scalalandio/chimney.git#305b0d985eac85b80f052091e6fec843cf0b45ef"
66

77
extra.exclude: ["*3", "*2_12", "*JS", "*Native", "benchmarks"]
8-
extra.commands: ${vars.default-commands} [
9-
// because scala/scala#10439, until maintainers move to 2.13.12
10-
"appendScalacOptions -Xmigration"
11-
]
128
}

‎proj/eff.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ vars.proj.eff: ${vars.base} {
55
uri: "https://github.com/atnos-org/eff.git#69937ba4310f7d7d379890c66ef2f25b7429b22f"
66

77
extra.exclude: ["scalazJVM", "*JS", "*Native"]
8-
extra.commands: ${vars.default-commands} [
9-
"appendScalacOptions -Xmigration"
10-
]
118
}

‎proj/fastparse.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ vars.proj.fastparse: ${vars.base} {
99
extra.commands: ${vars.default-commands} [
1010
// historically, too prone to unexplained failure
1111
"set scalaparse / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
12-
// because scala/scala#10439, until maintainers move to 2.13.12
13-
"appendScalacOptions -Xmigration"
1412
]
1513
}

‎proj/json4s.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ vars.proj.json4s: ${vars.base} {
77
extra.exclude: ["*JS", "*Native"]
88
extra.commands: ${vars.default-commands} [
99
"set every mimaPreviousArtifacts := Set()"
10-
// because scala/scala#10439, until maintainers move to 2.13.12
11-
"appendScalacOptions -Xmigration"
10+
"appendScalacOptions -Wconf:cat=scala3-migration:w"
1211
]
1312
}

‎proj/mima.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ vars.proj.mima: ${vars.base} {
1414
// since only one subproject has `it:test`
1515
extra.skip-missing-tests: true
1616
extra.commands: ${vars.default-commands} [
17-
// because scala/scala#10439, until maintainers move to 2.13.12
18-
"appendScalacOptions -Xmigration"
17+
"appendScalacOptions -Wconf:cat=scala3-migration:w"
1918
]
2019
}

‎proj/mouse.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ vars.proj.mouse: ${vars.base} {
66

77
extra.projects: ["crossJVM"] // no Scala.js please
88
extra.commands: ${vars.default-commands} [
9-
"appendScalacOptions -Xmigration"
109
// otherwise sbt-gpg errors on `publish`
1110
"set every gpgWarnOnFailure := true"
1211
]

‎proj/munit-cats-effect.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ vars.proj.munit-cats-effect: ${vars.base} {
66

77
extra.exclude: ["docs", "*JS", "*Native"]
88
extra.commands: ${vars.default-commands} [
9-
"appendScalacOptions -Xmigration"
109
// otherwise sbt-gpg errors on `publish`
1110
"set every gpgWarnOnFailure := true"
1211
]

‎proj/parboiled.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ vars.proj.parboiled: ${vars.base} {
88
extra.commands: ${vars.default-commands} [
99
// override some logic in their build.sbt
1010
"""set every scalaBinaryVersion := "2.13""""
11-
// because scala/scala#10439, until maintainers move to 2.13.12
12-
"appendScalacOptions -Xmigration"
1311
]
1412
}

‎proj/parsley.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,4 @@ vars.proj.parsley: ${vars.base} {
99
// not sure why the lack of this only causes a problem under dbuild...
1010
"""ThisBuild / homepage := Some(url("https://github.com/j-mie6/parsley"))"""
1111
]
12-
extra.commands: ${vars.default-commands} [
13-
// because scala/scala#10439, until maintainers move to 2.13.12
14-
"appendScalacOptions -Xmigration"
15-
]
1612
}

‎proj/scalacheck.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ vars.proj.scalacheck: ${vars.base} {
77
extra.exclude: ["root", "bench", "*JS", "*Native"]
88
extra.commands: ${vars.default-commands} [
99
"set every gpgWarnOnFailure := true"
10-
// because scala/scala#10439, until maintainers move to 2.13.12
11-
"appendScalacOptions -Xmigration"
1210
]
1311
}

‎proj/scalafx.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ vars.proj.scalafx: ${vars.base} {
1010
// work around https://github.com/scala/bug/issues/12509
1111
extra.commands: ${vars.default-commands} [
1212
"""set scalafx / Compile / doc / sources ~= (_.filterNot(_.toString.endsWith("SpotLight.scala")))"""
13-
// because scala/scala#10439, until maintainers move to 2.13.12
14-
"appendScalacOptions -Xmigration"
13+
"appendScalacOptions -Wconf:cat=scala3-migration:w"
1514
]
1615
}

‎proj/scalaprops.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ vars.proj.scalaprops: ${vars.base} {
55
uri: "https://github.com/scalaprops/scalaprops.git#0818b6d83e68bcf7ac0b5bf5ab815a8be3d11916"
66

77
extra.projects: ["scalapropsJVM"] // no Scala.js please
8-
extra.commands: ${vars.default-commands} [
9-
// because scala/scala#10439, until maintainers move to 2.13.12
10-
"appendScalacOptions -Xmigration"
11-
]
128
}

‎proj/scalikejdbc.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ vars.proj.scalikejdbc: ${vars.base} {
1212
]
1313
extra.commands: ${vars.default-commands} [
1414
"""set scalikejdbcStreams / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "DatabasePublisherTckTest.scala""""
15-
// because scala/scala#10439, until maintainers move to 2.13.12
16-
"appendScalacOptions -Xmigration"
1715
]
1816
}

‎proj/sconfig.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,4 @@ vars.proj.sconfig: ${vars.base} {
99
// our scalafix version is too new
1010
"scalafix-tests"
1111
]
12-
extra.commands: ${vars.default-commands} [
13-
// because scala/scala#10439, until maintainers move to 2.13.12
14-
"appendScalacOptions -Xmigration"
15-
]
1612
}

‎proj/skunk.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ vars.proj.skunk: ${vars.base} {
1111
]
1212
extra.commands: ${vars.default-commands} [
1313
"set every gpgWarnOnFailure := true"
14-
// because scala/scala#10439, until maintainers move to 2.13.12
15-
"appendScalacOptions -Xmigration"
1614
// I think the tests need a database, I get tons of java.net.ConnectExceptions
1715
"set tests.jvm / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
1816
]

‎proj/slick.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ vars.proj.slick: ${vars.base} {
1616
extra.commands: ${vars.default-commands} [
1717
// fails on JDK 20
1818
"""set testkit / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "MBeansTest.scala""""
19-
// because scala/scala#10439, until maintainers move to 2.13.12
20-
"appendScalacOptions -Xmigration"
2119
]
2220
}

‎proj/unfiltered.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,4 @@ vars.proj.unfiltered: ${vars.base} {
44
name: "unfiltered"
55
uri: "https://github.com/unfiltered/unfiltered.git#68e49128e7470bcf120a46e07d4a371cf0969a6c"
66

7-
extra.commands: ${vars.default-commands} [
8-
// because scala/scala#10439, until maintainers move to 2.13.12
9-
"appendScalacOptions -Xmigration"
10-
]
117
}

‎proj/unused-code.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ vars.proj.unused-code: ${vars.base} {
55
uri: "https://github.com/xuwei-k/unused-code.git#e53bba945219c56f113c4e95a3c9cc6190cbc762"
66

77
extra.projects: ["*2_13"]
8-
extra.commands: ${vars.default-commands} [
9-
// because scala/scala#10439, until maintainers move to 2.13.12
10-
"appendScalacOptions -Xmigration"
11-
]
128
}

‎proj/vault.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ vars.proj.vault: ${vars.base} {
77
extra.projects: ["coreJVM"] // no docs, no Scala.js
88
extra.commands: ${vars.default-commands} [
99
"set every gpgWarnOnFailure := true"
10-
"appendScalacOptions -Xmigration"
1110
]
1211
}

0 commit comments

Comments
 (0)