Skip to content

Commit 1ff4a02

Browse files
gzm0gzm0
authored
Merge pull request #4905 from gzm0/scala-2.13.12
Upgrade to Scala 2.13.12
2 parents e557529 + 06aedef commit 1ff4a02

File tree

79 files changed

+255
-4
lines changed

Some content is hidden

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

79 files changed

+255
-4
lines changed

‎Jenkinsfile

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

455455
def mainScalaVersion = "2.12.18"
456-
def mainScalaVersions = ["2.12.18", "2.13.11"]
456+
def mainScalaVersions = ["2.12.18", "2.13.12"]
457457
def otherScalaVersions = [
458458
"2.12.2",
459459
"2.12.3",
@@ -480,7 +480,8 @@ def otherScalaVersions = [
480480
"2.13.7",
481481
"2.13.8",
482482
"2.13.9",
483-
"2.13.10"
483+
"2.13.10",
484+
"2.13.11"
484485
]
485486

486487
def scala3Version = "3.2.1"

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ neg/universal-lint.scala
2727
# Uses .java files
2828
run/t9200
2929
run/noInlineUnknownIndy
30+
run/t12799
3031

3132
#
3233
# RUN
@@ -136,6 +137,7 @@ run/t10244.scala
136137
run/t10522.scala
137138
run/t11255
138139
run/transient-object.scala
140+
run/t12774.scala
139141

140142
# Using System.getProperties
141143

@@ -634,11 +636,13 @@ run/t12002.scala
634636
run/module-static.scala
635637
run/module-serialization-proxy-class-unload.scala
636638
run/t9644.scala
639+
run/t9644b
637640

638641
run/dotty-i11332.scala
639642
run/dotty-i11332b.scala
640643
run/dotty-t12348.scala
641644
run/t12348.scala
645+
run/t8465.scala
642646

643647
# Uses reflection indirectly through
644648
# scala.runtime.ScalaRunTime.replStringOf
@@ -827,6 +831,7 @@ run/t12705.scala
827831
run/t12390.scala
828832
run/repl-release.scala
829833
run/eta-dependent.scala
834+
run/t10655.scala
830835

831836
# Using Scala Script (partest.ScriptTest)
832837

@@ -957,6 +962,9 @@ run/t1406b.scala
957962
run/argfile.scala
958963
run/badout.scala
959964
run/debug-type-error.scala
965+
run/t12757.scala
966+
run/t12757b.scala
967+
run/t12757c.scala
960968

961969
# Using partest.StoreReporterDirectTest
962970
run/package-object-stale-decl.scala

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.11/neg/t6446-show-phases.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.12/neg/t6446-show-phases.check

File renamed without changes.

0 commit comments

Comments
 (0)