Skip to content

Commit 10634fc

Browse files
sjrdsjrd
committed
Upgrade to Scala 2.13.13.
1 parent 24266f9 commit 10634fc

File tree

81 files changed

+282
-7
lines changed

Some content is hidden

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

81 files changed

+282
-7
lines changed

‎Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ def allJavaVersions = otherJavaVersions.clone()
480480
allJavaVersions << mainJavaVersion
481481

482482
def mainScalaVersion = "2.12.19"
483-
def mainScalaVersions = ["2.12.19", "2.13.12"]
483+
def mainScalaVersions = ["2.12.19", "2.13.13"]
484484
def otherScalaVersions = [
485485
"2.12.2",
486486
"2.12.3",
@@ -509,7 +509,8 @@ def otherScalaVersions = [
509509
"2.13.8",
510510
"2.13.9",
511511
"2.13.10",
512-
"2.13.11"
512+
"2.13.11",
513+
"2.13.12"
513514
]
514515

515516
def scala3Version = "3.2.1"

‎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.13.12/BlacklistedTests.txt renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/BlacklistedTests.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ run/t12390.scala
832832
run/repl-release.scala
833833
run/eta-dependent.scala
834834
run/t10655.scala
835+
run/repl-suspended-warnings.scala
835836

836837
# Using Scala Script (partest.ScriptTest)
837838

@@ -950,7 +951,6 @@ run/t10641.scala
950951
run/t10751.scala
951952
run/t10819.scala
952953
run/t11385.scala
953-
run/t11731.scala
954954
run/t11746.scala
955955
run/t11815.scala
956956
run/splain.scala
@@ -972,6 +972,7 @@ run/package-object-toolbox.scala
972972
run/package-object-with-inner-class-in-ancestor.scala
973973
run/package-object-with-inner-class-in-ancestor-simpler.scala
974974
run/package-object-with-inner-class-in-ancestor-simpler-still.scala
975+
run/t7324.scala
975976
run/t10171
976977

977978
# partest.StubErrorMessageTest
@@ -994,6 +995,7 @@ run/t12597.scala
994995

995996
# partest.ASMConverters
996997
run/t9403
998+
run/nonfatal.scala
997999

9981000
# partest.BytecodeTest
9991001
run/t7106
@@ -1119,6 +1121,7 @@ run/t12195
11191121
run/t12380
11201122
run/t12523
11211123
run/t12290
1124+
run/t9714
11221125

11231126
# Using scala-script
11241127
run/t7791-script-linenums.scala

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.12/neg/t12494.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/neg/t12494.check

File renamed without changes.

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

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.12/neg/t6446-list.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/neg/t6446-list.check

File renamed without changes.

0 commit comments

Comments
 (0)