Skip to content

Commit ff72b7f

Browse files
sjrdsjrd
committed
Upgrade to Scala 2.13.16, and add 2.13.14, 2.13.15 to the CI.
1 parent 4f96d2c commit ff72b7f

File tree

86 files changed

+903
-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.

86 files changed

+903
-7
lines changed

‎Jenkinsfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ def allJavaVersions = otherJavaVersions.clone()
544544
allJavaVersions << mainJavaVersion
545545

546546
def mainScalaVersion = "2.12.20"
547-
def mainScalaVersions = ["2.12.20", "2.13.13"]
547+
def mainScalaVersions = ["2.12.20", "2.13.16"]
548548
def otherScalaVersions = [
549549
"2.12.6",
550550
"2.12.7",
@@ -569,7 +569,10 @@ def otherScalaVersions = [
569569
"2.13.9",
570570
"2.13.10",
571571
"2.13.11",
572-
"2.13.12"
572+
"2.13.12",
573+
"2.12.13",
574+
"2.12.14",
575+
"2.12.15"
573576
]
574577

575578
def scala3Version = "3.3.4"

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/BlacklistedTests.txt renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/BlacklistedTests.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ run/predef-cycle.scala
9494
run/synchronized.scala
9595
run/sd409.scala
9696
run/t12572.scala
97+
run/deadlock.scala
9798

9899
# Uses java.security
99100
run/t2318.scala
@@ -783,7 +784,6 @@ run/t7319.scala
783784
run/t7482a.scala
784785
run/t7634.scala
785786
run/t7747-repl.scala
786-
run/t7805-repl-i.scala
787787
run/tpeCache-tyconCache.scala
788788
run/repl-empty-package
789789
run/repl-javap-def.scala
@@ -843,6 +843,9 @@ run/repl-release.scala
843843
run/eta-dependent.scala
844844
run/t10655.scala
845845
run/repl-suspended-warnings.scala
846+
run/annot-infix-tostr.scala
847+
run/substSymRefinementOwner.scala
848+
run/t13050.scala
846849

847850
# Using Scala Script (partest.ScriptTest)
848851

@@ -935,7 +938,6 @@ run/t9097.scala
935938
run/macroPlugins-enterStats.scala
936939
run/sbt-icode-interface.scala
937940
run/t8502b.scala
938-
run/repl-paste-parse.scala
939941
run/t5463.scala
940942
run/t8433.scala
941943
run/sd275.scala
@@ -975,6 +977,8 @@ run/debug-type-error.scala
975977
run/t12757.scala
976978
run/t12757b.scala
977979
run/t12757c.scala
980+
run/huge-string.scala
981+
run/t12720.scala
978982

979983
# Using partest.StoreReporterDirectTest
980984
run/package-object-stale-decl.scala
@@ -984,6 +988,9 @@ run/package-object-with-inner-class-in-ancestor-simpler.scala
984988
run/package-object-with-inner-class-in-ancestor-simpler-still.scala
985989
run/t7324.scala
986990
run/t10171
991+
run/t12289.scala
992+
run/t12289b.scala
993+
run/t12289c.scala
987994

988995
# partest.StubErrorMessageTest
989996
run/StubErrorBInheritsFromA.scala
@@ -1013,6 +1020,7 @@ run/t7974
10131020
run/t8601-closure-elim.scala
10141021
run/t4788
10151022
run/t4788-separate-compilation
1023+
run/staticQualifier
10161024

10171025
# partest.SessionTest
10181026
run/t8843-repl-xlat.scala
@@ -1022,6 +1030,8 @@ run/t8918-unary-ids.scala
10221030
run/t1931.scala
10231031
run/t8935-class.scala
10241032
run/t8935-object.scala
1033+
run/t7722.scala
1034+
run/t7879.scala
10251035

10261036
# partest.JavapTest
10271037
run/t8608-no-format.scala
@@ -1132,6 +1142,8 @@ run/t12380
11321142
run/t12523
11331143
run/t12290
11341144
run/t9714
1145+
run/t13007
1146+
run/t13307b
11351147

11361148
# Using scala-script
11371149
run/t7791-script-linenums.scala

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/neg/t6446-missing.check renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/neg/t6446-missing.check

File renamed without changes.

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.13/neg/t6446-show-phases.check renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/neg/t6446-show-phases.check

File renamed without changes.

0 commit comments

Comments
 (0)