Skip to content

Commit

Permalink
make core compile under -Xsource:3
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Sep 13, 2021
1 parent 93d05a5 commit cb7a762
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
5 changes: 3 additions & 2 deletions core/kind-projector.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// https://github.com/typelevel/kind-projector.git#51ffa999d74dd8bc87b89a34da152e2d5ca08f3e
// https://github.com/scalacommunitybuild/kind-projector.git#community-build-2.13 # was typelevel, 51ffa999

// frozen (May 2021) just before an incompatible change:
// https://github.com/typelevel/kind-projector/pull/186
// forked (September 2021) to make tests compile under -Xsource:3

vars.proj.kind-projector: ${vars.base} {
name: "kind-projector"
uri: "https://github.com/typelevel/kind-projector.git#51ffa999d74dd8bc87b89a34da152e2d5ca08f3e"
uri: "https://github.com/scalacommunitybuild/kind-projector.git#93fabc53bbe43f19ef1e4e85d8e4a665a6fb3e1c"

}
7 changes: 7 additions & 0 deletions core/scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,11 @@ vars.proj.scalafix: ${vars.base} {
// of the picture anymore
"unit"
]
// even if we're running with -Xsource:3 build-wide, we don't want it in
// these subprojects, which contain all sorts of random Scala 2 code as tests,
// so can't be expected to conform to Scala 3 style
extra.commands: ${vars.default-commands} [
"""set testsOutput / scalacOptions -= "-Xsource:3""""
"""set testsInput / scalacOptions -= "-Xsource:3""""
]
}
6 changes: 4 additions & 2 deletions core/scalameta.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// https://github.com/scalameta/scalameta.git#v4.4.27
// https://github.com/scalacommunitybuild/scalameta.git#community-build-2.13 # was scalameta, v4.4.27

// we typically use a tag here rather than track a branch, in the
// interest of stability. whatever tag scalafmt and/or scalafix expect

// forked (September 2021) from v4.4.27 tag to make it compile with `-Xsource:3`

vars.proj.scalameta: ${vars.base} {
name: "scalameta"
uri: "https://github.com/scalameta/scalameta.git#5b978a5cc6f3f185763bb1e7d2c8888e1de8a611"
uri: "https://github.com/scalacommunitybuild/scalameta.git#38e8fa7fdc17a83b8edd85f76359eab2e2911387"

extra.projects: ["semanticdbScalacPlugin", "testkitJVM"]
extra.commands: ${vars.default-commands} [
Expand Down
7 changes: 6 additions & 1 deletion core/wartremover.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

vars.proj.wartremover: ${vars.base} {
name: "wartremover"
uri: "https://github.com/wartremover/wartremover.git#c43465833bfb6aa150c54ec590b3da8599531c40"
uri: "https://github.com/wartremover/wartremover.git#72e4fe0dff3ff4021dd816d231bb69ba0a99a7f8"

extra.exclude: [
"sbt-plugin"
"core-cross-binary" // same artifact(s) as "core"
]
deps.ignore: ["org.scala-sbt#scripted-plugin"]
check-missing: false
extra.commands: ${vars.default-commands} [
// we exclude these test sources because they contain code that fails to compile under
// -Xsource:3 (which we want to be able to test in the community build)
"""set core / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "StringPlusAnyTest.scala" || "UnsafeTest.scala""""
]
}

0 comments on commit cb7a762

Please sign in to comment.