Skip to content

Commit 34f86b8

Browse files
gzm0gzm0
authored
Merge pull request #4964 from sjrd/scala-2.12.19-2.13.13
Upgrade to Scala 2.12.19 and 2.13.13.
2 parents 27bd1b8 + 10634fc commit 34f86b8

File tree

166 files changed

+503
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+503
-25
lines changed

‎Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ def otherJavaVersions = ["11", "16"]
479479
def allJavaVersions = otherJavaVersions.clone()
480480
allJavaVersions << mainJavaVersion
481481

482-
def mainScalaVersion = "2.12.18"
483-
def mainScalaVersions = ["2.12.18", "2.13.12"]
482+
def mainScalaVersion = "2.12.19"
483+
def mainScalaVersions = ["2.12.19", "2.13.13"]
484484
def otherScalaVersions = [
485485
"2.12.2",
486486
"2.12.3",
@@ -497,6 +497,7 @@ def otherScalaVersions = [
497497
"2.12.15",
498498
"2.12.16",
499499
"2.12.17",
500+
"2.12.18",
500501
"2.13.0",
501502
"2.13.1",
502503
"2.13.2",
@@ -508,7 +509,8 @@ def otherScalaVersions = [
508509
"2.13.8",
509510
"2.13.9",
510511
"2.13.10",
511-
"2.13.11"
512+
"2.13.11",
513+
"2.13.12"
512514
]
513515

514516
def scala3Version = "3.2.1"

‎junit-runtime/src/main/scala/org/junit/Assume.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ object Assume {
3333
@noinline
3434
def assumeThat[T](actual: T, matcher: Matcher[T]): Unit = {
3535
if (!matcher.matches(actual.asInstanceOf[AnyRef]))
36-
throw new AssumptionViolatedException(actual, matcher)
36+
throw new AssumptionViolatedException(null, matcher, actual)
3737
}
3838

3939
@noinline
4040
def assumeThat[T](message: String, actual: T, matcher: Matcher[T]): Unit = {
4141
if (!matcher.matches(actual.asInstanceOf[AnyRef]))
42-
throw new AssumptionViolatedException(message, actual, matcher)
42+
throw new AssumptionViolatedException(message, matcher, actual)
4343
}
4444

4545
@noinline

‎junit-runtime/src/main/scala/org/junit/AssumptionViolatedException.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ class AssumptionViolatedException protected (fAssumption: String,
1919
def this(message: String, expected: Any, matcher: Matcher[_]) =
2020
this(message, true, fMatcher = matcher, fValue = expected.asInstanceOf[AnyRef])
2121

22+
// Non-deprecated access to the full constructor for use in `Assume.scala`
23+
private[junit] def this(message: String, matcher: Matcher[_], actual: Any) =
24+
this(message, true, fMatcher = matcher, fValue = actual.asInstanceOf[AnyRef])
25+
2226
def this(message: String) =
2327
this(message, false, null, null)
2428

‎library/src/main/scala-new-collections/scala/scalajs/js/WrappedDictionary.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ final class WrappedDictionary[A](private val dict: js.Dictionary[A])
9999
def iterator: scala.collection.Iterator[(String, A)] =
100100
new DictionaryIterator(dict)
101101

102+
/* Warning silenced in build for 2.13.13+:
103+
* overriding method keys in trait MapOps is deprecated (since 2.13.13):
104+
* This method should be an alias for keySet
105+
*/
102106
@inline
103107
override def keys: scala.collection.Iterable[String] =
104108
js.Object.keys(dict.asInstanceOf[js.Object])

‎library/src/main/scala-new-collections/scala/scalajs/js/WrappedMap.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ final class WrappedMap[K, V](private val underlying: js.Map[K, V])
9595
def iterator: scala.collection.Iterator[(K, V)] =
9696
underlying.jsIterator().toIterator.map(kv => (kv._1, kv._2))
9797

98+
/* Warning silenced in build for 2.13.13+:
99+
* overriding method keys in trait MapOps is deprecated (since 2.13.13):
100+
* This method should be an alias for keySet
101+
*/
98102
@inline
99103
override def keys: scala.collection.Iterable[K] =
100104
underlying.asInstanceOf[js.Map.Raw[K, V]].keys().toIterator.to(Iterable)

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.18/BlacklistedTests.txt renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/BlacklistedTests.txt

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.18/neg/choices.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/neg/choices.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.18/neg/partestInvalidFlag.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/neg/partestInvalidFlag.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.18/neg/t11952b.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/neg/t11952b.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.18/neg/t6446-additional.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/neg/t6446-additional.check

File renamed without changes.

0 commit comments

Comments
 (0)