Skip to content

Commit e7e63cb

Browse files
authored
Merge pull request scala/scala#8660 from retronym/backport/sbt-bump
[backport] Upgrade 2.12.x build to SBT 1.3.7 [ci: last-only]
2 parents c1f0c2d + 81fd5c6 commit e7e63cb

File tree

3 files changed

+10
-73
lines changed

3 files changed

+10
-73
lines changed

library/src/mima-filters/2.12.0.backwards.excludes

Lines changed: 0 additions & 11 deletions
This file was deleted.

library/src/mima-filters/2.12.0.forwards.excludes

Lines changed: 0 additions & 62 deletions
This file was deleted.

library/src/scala/collection/GenIterableLike.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,13 @@ trait GenIterableLike[+A, +Repr] extends Any with GenTraversableLike[A, Repr] {
147147
def zipAll[B, A1 >: A, That](that: GenIterable[B], thisElem: A1, thatElem: B)(implicit bf: CBF[Repr, (A1, B), That]): That
148148

149149
}
150+
151+
// Workaround for Scaladoc @usecase position bug scala/issues#11865
152+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
153+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
154+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
155+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
156+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
157+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
158+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
159+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)