Skip to content

Commit b2a3404

Browse files
committed
get scalastyle and discipline-scalatest on sbt 1.6
1 parent 8c246c3 commit b2a3404

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

proj/discipline-scalatest.conf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
// https://github.com/scalacommunitybuild/discipline-scalatest.git#community-build-2.13 # was typelevel, main
2-
3-
// forked (August 2021) to remove sbt-dotty;
4-
// unfork pending merge of https://github.com/typelevel/discipline-scalatest/pull/204 ?
1+
// https://github.com/typelevel/discipline-scalatest.git#main
52

63
vars.proj.discipline-scalatest: ${vars.base} {
74
name: "discipline-scalatest"
8-
uri: "https://github.com/scalacommunitybuild/discipline-scalatest.git#98a0fbbaaa7d3c04e04323c09ab8e8fea142607a"
5+
uri: "https://github.com/typelevel/discipline-scalatest.git#92b52910555302c433a63d888c92ed4f9ce0ec2a"
96

107
extra.exclude: ["*JS", "*Native", "docs"]
118
}

proj/scalastyle.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
vars.proj.scalastyle: ${vars.base} {
66
name: "scalastyle"
7-
uri: "https://github.com/beautiful-scala/scalastyle.git#6ccbbb064bcc84f8c90e177598372f8dfdcd571f"
7+
uri: "https://github.com/beautiful-scala/scalastyle.git#cff4fde2f388ec33e2dade7cf571b63cc7716359"
88

9-
// pending merge of https://github.com/beautiful-scala/scalastyle/pull/209
10-
extra.sbt-version: ${vars.sbt-1-5-version} // https://github.com/scoverage/sbt-scoverage/issues/372
119
}

0 commit comments

Comments
 (0)