Skip to content

Upgrade to Scala 2.12.20 and 2.13.16. #5113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,8 @@ def otherJavaVersions = ["11", "17", "21"]
def allJavaVersions = otherJavaVersions.clone()
allJavaVersions << mainJavaVersion

def mainScalaVersion = "2.12.19"
def mainScalaVersions = ["2.12.19", "2.13.13"]
def mainScalaVersion = "2.12.20"
def mainScalaVersions = ["2.12.20", "2.13.16"]
def otherScalaVersions = [
"2.12.6",
"2.12.7",
Expand All @@ -559,6 +559,7 @@ def otherScalaVersions = [
"2.12.16",
"2.12.17",
"2.12.18",
"2.12.19",
"2.13.3",
"2.13.4",
"2.13.5",
Expand All @@ -568,7 +569,10 @@ def otherScalaVersions = [
"2.13.9",
"2.13.10",
"2.13.11",
"2.13.12"
"2.13.12",
"2.12.13",
"2.12.14",
"2.12.15"
]

def scala3Version = "3.3.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ run/t10233.scala
run/t10244.scala
run/t10522.scala
run/t11255
run/t12774.scala
run/transient-object.scala

# Using System.getProperties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ run/predef-cycle.scala
run/synchronized.scala
run/sd409.scala
run/t12572.scala
run/deadlock.scala

# Uses java.security
run/t2318.scala
Expand Down Expand Up @@ -783,7 +784,6 @@ run/t7319.scala
run/t7482a.scala
run/t7634.scala
run/t7747-repl.scala
run/t7805-repl-i.scala
run/tpeCache-tyconCache.scala
run/repl-empty-package
run/repl-javap-def.scala
Expand Down Expand Up @@ -843,6 +843,9 @@ run/repl-release.scala
run/eta-dependent.scala
run/t10655.scala
run/repl-suspended-warnings.scala
run/annot-infix-tostr.scala
run/substSymRefinementOwner.scala
run/t13050.scala

# Using Scala Script (partest.ScriptTest)

Expand Down Expand Up @@ -935,7 +938,6 @@ run/t9097.scala
run/macroPlugins-enterStats.scala
run/sbt-icode-interface.scala
run/t8502b.scala
run/repl-paste-parse.scala
run/t5463.scala
run/t8433.scala
run/sd275.scala
Expand Down Expand Up @@ -975,6 +977,8 @@ run/debug-type-error.scala
run/t12757.scala
run/t12757b.scala
run/t12757c.scala
run/huge-string.scala
run/t12720.scala

# Using partest.StoreReporterDirectTest
run/package-object-stale-decl.scala
Expand All @@ -984,6 +988,9 @@ run/package-object-with-inner-class-in-ancestor-simpler.scala
run/package-object-with-inner-class-in-ancestor-simpler-still.scala
run/t7324.scala
run/t10171
run/t12289.scala
run/t12289b.scala
run/t12289c.scala

# partest.StubErrorMessageTest
run/StubErrorBInheritsFromA.scala
Expand Down Expand Up @@ -1013,6 +1020,7 @@ run/t7974
run/t8601-closure-elim.scala
run/t4788
run/t4788-separate-compilation
run/staticQualifier

# partest.SessionTest
run/t8843-repl-xlat.scala
Expand All @@ -1022,6 +1030,8 @@ run/t8918-unary-ids.scala
run/t1931.scala
run/t8935-class.scala
run/t8935-object.scala
run/t7722.scala
run/t7879.scala

# partest.JavapTest
run/t8608-no-format.scala
Expand Down Expand Up @@ -1132,6 +1142,8 @@ run/t12380
run/t12523
run/t12290
run/t9714
run/t13007
run/t13307b

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

default212ScalaVersion := cross212ScalaVersions.value.last,
Expand Down Expand Up @@ -2063,7 +2067,7 @@ object Build {
if (!useMinifySizes) {
Some(ExpectedSizes(
fastLink = 449000 to 450000,
fullLink = 94000 to 95000,
fullLink = 95000 to 96000,
fastLinkGz = 58000 to 59000,
fullLinkGz = 25000 to 26000,
))
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/cross-version/2.13/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ enablePlugins(ScalaJSPlugin)
enablePlugins(ScalaJSJUnitPlugin)

version := scalaJSVersion
scalaVersion := "2.13.13"
scalaVersion := "2.13.16"

scalaJSUseMainModuleInitializer := true
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ lazy val concurrentUseOfLinkerTest = taskKey[Any]("")
name := "Scala.js sbt test"

version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
4 changes: 2 additions & 2 deletions sbt-plugin/src/sbt-test/linker/custom-linker/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@

inThisBuild(Def.settings(
version := scalaJSVersion,
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
))

lazy val check = taskKey[Any]("")

lazy val customLinker = project.in(file("custom-linker"))
.settings(
scalaVersion := "2.12.19", // needs to match the minor version of Scala used by sbt
scalaVersion := "2.12.20", // needs to match the minor version of Scala used by sbt
libraryDependencies += "org.scala-js" %% "scalajs-linker" % scalaJSVersion,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name := "Scala.js sbt test"

version in ThisBuild := scalaJSVersion
scalaVersion in ThisBuild := "2.12.19"
scalaVersion in ThisBuild := "2.12.20"

// Disable the IvyPlugin on the root project
disablePlugins(sbt.plugins.IvyPlugin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/scala3/tasty-reader/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lazy val app = project.in(file("app"))
.enablePlugins(ScalaJSPlugin)
.dependsOn(testlib)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.16",
scalacOptions += "-Ytasty-reader",
scalaJSUseMainModuleInitializer := true
)
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/settings/cross-version/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.scalajs.sbtplugin.ScalaJSCrossVersion
val check = taskKey[Unit]("Run checks of this test")

version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

lazy val js = project.enablePlugins(ScalaJSPlugin).settings(
check := {
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/settings/env-vars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inThisBuild(Def.settings(
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
))

lazy val sharedSettings = Def.settings(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val checkNoClosure = taskKey[Unit]("Check that fullOptJS wasn't run with closure")

version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/settings/module-init/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
val check = taskKey[Unit]("Run checks of this test")

version := scalaJSVersion
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"

enablePlugins(ScalaJSPlugin)

Expand Down
Loading
Loading