8000 Upgrade to Scala 2.13.16, and add 2.13.14, 2.13.15 to the CI. · scala-js/scala-js@ff72b7f · GitHub
[go: up one dir, main page]

Skip to content

Commit ff72b7f

Browse files
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
< 10000 td data-grid-cell-id="diff-06a133d9d40c9d0260fd8487ab284687304a599306348378db61f03937435de0-937-940-1" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">940
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
937
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< E377 /div>
11351147

11361148
# Using scala-script
11371149
run/t7791-script-linenums.scala
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
phase name id description
2+
---------- -- -----------
3+
parser 1 parse source into ASTs, perform simple desugaring
4+
jspretyper 2 capture pre-typer only tree info (for Scala.js)
5+
namer 3 resolve names, attach symbols to named trees
6+
packageobjects 4 load package objects
7+
typer 5 the meat and potatoes: type the trees
8+
C8 0 C8 makes C7 reachable
9+
jsinterop 7 prepare ASTs for JavaScript interop
10+
superaccessors 8 add super accessors in traits and nested classes
11+
C7 0 C7 has only a before constraint
12+
extmethods 10 add extension methods for inline classes
13+
pickler 11 serialize symbol tables
14+
refchecks 12 reference/override checking, translate nested objects
15+
patmat 13 translate match expressions
16+
xplicitinnerjs 14 make references to inner JS classes explicit
17+
uncurry 15 uncurry, translate function values to anonymous classes
18+
fields 16 synthesize accessors and fields, add bitmaps for lazy vals
19+
tailcalls 17 replace tail calls by jumps
20+
specialize 18 @specialized-driven class and method specialization
21+
xplicitlocaljs 19 make references to local JS classes explicit
22+
explicitouter 20 this refs to outer pointers
23+
erasure 21 erase types, add interfaces for traits
24+
posterasure 22 clean up erased inline classes
25+
lambdalift 23 move nested functions to top level
26+
constructors 24 move field definitions into constructors
27+
flatten 25 eliminate inner classes
28+
mixin 26 mixin composition
29+
jscode 27 generate JavaScript code from ASTs
30+
cleanup 28 platform-specific cleanups, generate reflective calls
31+
delambdafy 29 remove lambdas
32+
jvm 30 generate JVM bytecode
33+
terminal 31 the last phase during a compilation run
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
warning: No phase `refchicks` for ploogin.runsAfter - did you mean refchecks?
2+
warning: No phase `java` for ploogin.runsBefore - did you mean jvm?
3+
warning: Dropping phase ploogin, it is not reachable from parser
4+
phase name id description
5+
---------- -- -----------
6+
parser 1 parse source into ASTs, perform simple desugaring
7+
jspretyper 2 capture pre-typer only tree info (for Scala.js)
8+
namer 3 resolve names, attach symbols to named trees
9+
packageobjects 4 load package objects
10+
typer 5 the meat and potatoes: type the trees
11+
jsinterop 6 prepare ASTs for JavaScript interop
12+
superaccessors 7 add super accessors in traits and nested classes
13+
extmethods 8 add extension methods for inline classes
14+
pickler 9 serialize symbol tables
15+
refchecks 10 reference/override checking, translate nested objects
16+
patmat 11 translate match expressions
17+
xplicitinnerjs 12 make references to inner JS classes explicit
18+
uncurry 13 uncurry, translate function values to anonymous classes
19+
fields 14 synthesize accessors and fields, add bitmaps for lazy vals
20+
tailcalls 15 replace tail calls by jumps
21+
specialize 16 @specialized-driven class and method specialization
22+
xplicitlocaljs 17 make references to local JS classes explicit
23+
explicitouter 18 this refs to outer pointers
24+
erasure 19 erase types, add interfaces for traits
25+
posterasure 20 clean up erased inline classes
26+
lambdalift 21 move nested functions to top level
27+
constructors 22 move field definitions into constructors
28+
flatten 23 eliminate inner classes
29+
mixin 24 mixin composition
30+
jscode 25 generate JavaScript code from ASTs
31+
cleanup 26 platform-specific cleanups, generate reflective calls
32+
delambdafy 27 remove lambdas
33+
jvm 28 generate JVM bytecode
34+
terminal 29 the last phase during a compilation run
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
warning: Dropping phase ploogin, it is not reachable from parser
2+
phase name id description
3+
---------- -- -----------
4+
parser 1 parse source into ASTs, perform simple desugaring
5+
jspretyper 2 capture pre-typer only tree info (for Scala.js)
6+
namer 3 resolve names, attach symbols to named trees
7+
packageobjects 4 load package objects
8+
typer 5 the meat and potatoes: type the trees
9+
jsinterop 6 prepare ASTs for JavaScript interop
10+
superaccessors 7 add super accessors in traits and nested classes
11+
extmethods 8 add extension methods for inline classes
12+
pickler 9 serialize symbol tables
13+
refchecks 10 reference/override checking, translate nested objects
14+
patmat 11 translate match expressions
15+
xplicitinnerjs 12 make references to inner JS classes explicit
16+
uncurry 13 uncurry, translate function values to anonymous classes
17+
fields 14 synthesize accessors and fields, add bitmaps for lazy vals
18+
tailcalls 15 replace tail calls by jumps
19+
specialize 16 @specialized-driven class and method specialization
20+
xplicitlocaljs 17 make references to local JS classes explicit
21+
explicitouter 18 this refs to outer pointers
22+
erasure 19 erase types, add interfaces for traits
23+
posterasure 20 clean up erased inline classes
24+
lambdalift 21 move nested functions to top level
25+
constructors 22 move field definitions into constructors
26+
flatten 23 eliminate inner classes
27+
mixin 24 mixin composition
28+
jscode 25 10000 generate JavaScript code from ASTs
29+
cleanup 26 platform-specific cleanups, generate reflective calls
30+
delambdafy 27 remove lambdas
31+
jvm 28 generate JVM bytecode
32+
terminal 29 the last phase during a compilation run
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
phase name id description
2+
---------- -- -----------
3+
parser 1 parse source into ASTs, perform simple desugaring
4+
jspretyper 2 capture pre-typer only tree info (for Scala.js)
5+
namer 3 resolve names, attach symbols to named trees
6+
packageobjects 4 load package objects
7+
typer 5 the meat and potatoes: type the trees
8+
C1 0 C1 tests phase assembly
9+
jsinterop 7 prepare ASTs for JavaScript interop
10+
superaccessors 8 add super accessors in traits and nested classes
11+
extmethods 9 add extension methods for inline classes
12+
pickler 10 serialize symbol tables
13+
refchecks 11 reference/override checking, translate nested objects
14+
patmat 12 translate match expressions
15+
xplicitinnerjs 13 make references to inner JS classes explicit
16+
C6 0 C6 tests phase assembly after a phase missing in Scaladoc
17+
uncurry 15 uncurry, translate function values to anonymous classes
18+
fields 16 synthesize accessors and fields, add bitmaps for lazy vals
19+
tailcalls 17 replace tail calls by jumps
20+
specialize 18 @specialized-driven class and method specialization
21+
xplicitlocaljs 19 make references to local JS classes explicit
22+
explicitouter 20 this refs to outer pointers
23+
erasure 21 erase types, add interfaces for traits
24+
posterasure 22 clean up erased inline classes
25+
lambdalift 23 move nested functions to top level
26+
constructors 24 move field definitions into constructors
27+
flatten 25 eliminate inner classes
28+
mixin 26 mixin composition
29+
jscode 27 generate JavaScript code from ASTs
30+
cleanup 28 platform-specific cleanups, generate reflective calls
31+
delambdafy 29 remove lambdas
32+
jvm 30 generate JVM bytecode
33+
terminal 31 the last phase during a compilation run

project/Build.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,9 @@ object Build {
969969
"2.13.11",
970970
"2.13.12",
971971
"2.13.13",
972+
"2.13.14",
973+
"2.13.15",
974+
"2.13.16",
972975
),
973976

974977
default212ScalaVersion := cross212ScalaVersions.value.last,
@@ -2064,7 +2067,7 @@ object Build {
20642067
if (!useMinifySizes) {
20652068
Some(ExpectedSizes(
20662069
fastLink = 449000 to 450000,
2067-
fullLink = 94000 to 95000,
2070+
fullLink = 95000 to 96000,
20682071
fastLinkGz = 58000 to 59000,
20692072
fullLinkGz = 25000 to 26000,
20702073
))

sbt-plugin/src/sbt-test/cross-version/2.13/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ enablePlugins(ScalaJSPlugin)
22
enablePlugins(ScalaJSJUnitPlugin)
33

44
version := scalaJSVersion
5-
scalaVersion := "2.13.13"
5+
scalaVersion := "2.13.16"
66

77
scalaJSUseMainModuleInitializer := true

sbt-plugin/src/sbt-test/scala3/tasty-reader/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lazy val app = project.in(file("app"))
1010
.enablePlugins(ScalaJSPlugin)
1111
.dependsOn(testlib)
1212
.settings(
13-
scalaVersion := "2.13.13",
13+
scalaVersion := "2.13.16",
1414
scalacOptions += "-Ytasty-reader",
1515
scalaJSUseMainModuleInitializer := true
1616
)

0 commit comments

Comments
 (0)
0