8000 Upgrade to Scala 2.12.20. · scala-js/scala-js@4f96d2c · GitHub
[go: up one dir, main page]

Skip to content

Commit 4f96d2c

Browse files
committed
Upgrade to Scala 2.12.20.
1 parent 2cdb10b commit 4f96d2c

File tree

86 files changed

+217
-17
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

+217
-17
lines changed

Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,8 @@ def otherJavaVersions = ["11", "17", "21"]
543543
def allJavaVersions = otherJavaVersions.clone()
544544
allJavaVersions << mainJavaVersion
545545

546-
def mainScalaVersion = "2.12.19"
547-
def mainScalaVersions = ["2.12.19", "2.13.13"]
546+
def mainScalaVersion = "2.12.20"
547+
def mainScalaVersions = ["2.12.20", "2.13.13"]
548548
def otherScalaVersions = [
549549
"2.12.6",
550550
"2.12.7",
@@ -559,6 +559,7 @@ def otherScalaVersions = [
559559
"2.12.16",
560560
"2.12.17",
561561
"2.12.18",
562+
"2.12.19",
562563
"2.13.3",
563564
"2.13.4",
564565
"2.13.5",

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.19/BlacklistedTests.txt renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.20/BlacklistedTests.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ run/t10233.scala
145145
run/t10244.scala
146146
run/t10522.scala
147147
run/t11255
148+
run/t12774.scala
148149
run/transient-object.scala
149150

150151
# Using System.getProperties

project/Build.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ object Build {
955955
"2.12.17",
956956
"2.12.18",
957957
"2.12.19",
958+
"2.12.20",
958959
),
959960
cross213ScalaVersions := Seq(
960961
"2.13.3",

sbt-plugin/src/sbt-test/incremental/change-config-and-source/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.19"
1+
scalaVersion := "2.12.20"
22

33
enablePlugins(ScalaJSPlugin)
44

sbt-plugin/src/sbt-test/incremental/change-config/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.19"
1+
scalaVersion := "2.12.20"
22

33
enablePlugins(ScalaJSPlugin)
44

sbt-plugin/src/sbt-test/incremental/fix-compile-error/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.19"
1+
scalaVersion := "2.12.20"
22

33
enablePlugins(ScalaJSPlugin)
44

sbt-plugin/src/sbt-test/linker/concurrent-linker-use/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lazy val concurrentUseOfLinkerTest = taskKey[Any]("")
1111
name := "Scala.js sbt test"
1212

1313
version := scalaJSVersion
14-
scalaVersion := "2.12.19"
14+
scalaVersion := "2.12.20"
1515

1616
enablePlugins(ScalaJSPlugin)
1717

sbt-plugin/src/sbt-test/linker/custom-linker/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
inThisBuild(Def.settings(
1515
version := scalaJSVersion,
16-
scalaVersion := "2.12.19",
16+
scalaVersion := "2.12.20",
1717
))
1818

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

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

sbt-plugin/src/sbt-test/linker/no-root-dependency-resolution/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "Scala.js sbt test"
22

33
version in ThisBuild := scalaJSVersion
4-
scalaVersion in ThisBuild := "2.12.19"
4+
scalaVersion in ThisBuild := "2.12.20"
55

66
// Disable the IvyPlugin on the root project
77
disablePlugins(sbt.plugins.IvyPlugin)

sbt-plugin/src/sbt-test/linker/non-existent-classpath/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version := scalaJSVersion
2-
scalaVersion := "2.12.19"
2+
scalaVersion := "2.12.20"
33

44
enablePlugins(ScalaJSPlugin)
55

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.sbtplugin.ScalaJSCrossVersion
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.19"
6+
scalaVersion := "2.12.20"
77

88
lazy val js = project.enablePlugins(ScalaJSPlugin).settings(
99
check := {

sbt-plugin/src/sbt-test/settings/env-vars/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
inThisBuild(Def.settings(
2-
scalaVersion := "2.12.19",
2+
scalaVersion := "2.12.20",
33
))
44

55
lazy val sharedSettings = Def.settings(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
version := scalaJSVersion
2-
scalaVersion := "2.12.19"
2+
scalaVersion := "2.12.20"
33

44
enablePlugins(ScalaJSPlugin)

sbt-plugin/src/sbt-test/settings/legacy-link-tasks/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
val checkNoClosure = taskKey[Unit]("Check that fullOptJS wasn't run with closure")
22

33
version := scalaJSVersion
4-
scalaVersion := "2.12.19"
4+
scalaVersion := "2.12.20"
55

66
enablePlugins(ScalaJSPlugin)
77

sbt-plugin/src/sbt-test/settings/module-init/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.19"
6+
scalaVersion := "2.12.20"
77

88
enablePlugins(ScalaJSPlugin)
99

sbt-plugin/src/sbt-test/settings/source-map/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.19"
6+
scalaVersion := "2.12.20"
77

88
enablePlugins(ScalaJSPlugin)
99

sbt-plugin/src/sbt-test/testing/multi-framework/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
inThisBuild(version := scalaJSVersion)
2-
inThisBuild(scalaVersion := "2.12.19")
2+
inThisBuild(scalaVersion := "2.12.20")
33

44
lazy val root = project.in(file(".")).
55
aggregate(multiTestJS, multiTestJVM)
Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
## Do not compile
2+
scala/lang/annotations/BytecodeTest.scala
3+
scala/lang/annotations/RunTest.scala
4+
scala/lang/traits/BytecodeTest.scala
5+
scala/lang/traits/RunTest.scala
6+
scala/lang/primitives/NaNTest.scala
7+
scala/lang/primitives/BoxUnboxTest.scala
8+
scala/collection/SeqTest.scala
9+
scala/collection/Sizes.scala
10+
scala/collection/immutable/HashMapTest.scala
11+
scala/collection/immutable/HashSetTest.scala
12+
scala/collection/immutable/ListMapTest.scala
13+
scala/collection/immutable/MapHashcodeTest.scala
14+
scala/collection/immutable/SetTest.scala
15+
scala/collection/immutable/SeqTest.scala
16+
scala/collection/immutable/SmallMapTest.scala
17+
scala/collection/immutable/SortedMapTest.scala
18+
scala/collection/immutable/SortedSetTest.scala
19+
scala/collection/immutable/TreeMapTest.scala
20+
scala/collection/immutable/TreeSetTest.scala
21+
scala/reflect/ClassOfTest.scala
22+
scala/reflect/QTest.scala
23+
scala/reflect/io/AbstractFileTest.scala
24+
scala/reflect/io/ZipArchiveTest.scala
25+
scala/reflect/internal/util/AbstractFileClassLoaderTest.scala
26+
scala/reflect/internal/util/FileUtilsTest.scala
27+
scala/reflect/internal/util/SourceFileTest.scala
2 10000 8+
scala/reflect/internal/util/StringOpsTest.scala
29+
scala/reflect/internal/util/WeakHashSetTest.scala
30+
scala/reflect/internal/LongNamesTest.scala
31+
scala/reflect/internal/MirrorsTest.scala
32+
scala/reflect/internal/NamesTest.scala
33+
scala/reflect/internal/PositionsTest.scala
34+
scala/reflect/internal/PrintersTest.scala
35+
scala/reflect/internal/ScopeTest.scala
36+
scala/reflect/internal/TreeGenTest.scala
37+
scala/reflect/internal/TypesTest.scala
38+
scala/reflect/macros/AttachmentsTest.scala
39+
scala/reflect/runtime/ReflectionUtilsShowTest.scala
40+
scala/reflect/runtime/ThreadSafetyTest.scala
41+
scala/runtime/BooleanBoxingTest.scala
42+
scala/runtime/ByteBoxingTest.scala
43+
scala/runtime/CharBoxingTest.scala
44+
scala/runtime/DoubleBoxingTest.scala
45+
scala/runtime/IntBoxingTest.scala
46+
scala/runtime/FloatBoxingTest.scala
47+
scala/runtime/LongBoxingTest.scala
48+
scala/runtime/ShortBoxingTest.scala
49+
scala/tools/cmd/CommandLineParserTest.scala
50+
scala/tools/nsc/Build.scala
51+
scala/tools/nsc/DeterminismTest.scala
52+
scala/tools/nsc/DeterminismTester.scala
53+
scala/tools/nsc/FileUtils.scala
54+
scala/tools/nsc/GlobalCustomizeClassloaderTest.scala
55+
scala/tools/nsc/PickleWriteTest.scala
56+
scala/tools/nsc/PipelineMainTest.scala
57+
scala/tools/nsc/async/AnnotationDrivenAsync.scala
58+
scala/tools/nsc/async/CustomFuture.scala
59+
scala/tools/nsc/backend/jvm/BTypesTest.scala
60+
scala/tools/nsc/backend/jvm/BytecodeTest.scala
61+
scala/tools/nsc/backend/jvm/ClassfileParserTest.scala
62+
scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
63+
scala/tools/nsc/backend/jvm/DirectCompileTest.scala
64+
scala/tools/nsc/backend/jvm/GenericSignaturesTest.scala
65+
scala/tools/nsc/backend/jvm/IndyLambdaDirectTest.scala
66+
scala/tools/nsc/backend/jvm/IndyLambdaTest.scala
67+
scala/tools/nsc/backend/jvm/IndySammyTest.scala
68+
scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
69+
scala/tools/nsc/backend/jvm/LineNumberTest.scala
70+
scala/tools/nsc/backend/jvm/NestedClassesCollectorTest.scala
71+
scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
72+
scala/tools/nsc/backend/jvm/PerRunInitTest.scala
73+
scala/tools/nsc/backend/jvm/StringConcatTest.scala
74+
scala/tools/nsc/backend/jvm/analysis/NullnessAnalyzerTest.scala
75+
scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzerTest.scala
76+
scala/tools/nsc/backend/jvm/opt/AnalyzerTest.scala
77+
scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
78+
scala/tools/nsc/backend/jvm/opt/BoxUnboxTest.scala
79+
scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala
80+
scala/tools/nsc/backend/jvm/opt/CallGraphTest.scala
81+
scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
82+
scala/tools/nsc/backend/jvm/opt/CompactLocalVariablesTest.scala
83+
scala/tools/nsc/backend/jvm/opt/EmptyExceptionHandlersTest.scala
84+
scala/tools/nsc/backend/jvm/opt/EmptyLabelsAndLineNumbersTest.scala
85+
scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
86+
scala/tools/nsc/backend/jvm/opt/InlinerIllegalAccessTest.scala
87+
scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
88+
scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
89+
scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
90+
scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
91+
scala/tools/nsc/backend/jvm/opt/MethodLevelOptsTest.scala
92+
scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala
93+
scala/tools/nsc/backend/jvm/opt/SimplifyJumpsTest.scala
94+
scala/tools/nsc/backend/jvm/opt/UnreachableCodeTest.scala
95+
scala/tools/nsc/backend/jvm/opt/UnusedLocalVariablesTest.scala
96+
scala/tools/nsc/ScriptRunnerTest.scala
97+
scala/tools/nsc/classpath/AggregateClassPathTest.scala
98+
scala/tools/nsc/classpath/JrtClassPathTest.scala
99+
scala/tools/nsc/classpath/MultiReleaseJarTest.scala
100+
scala/tools/nsc/classpath/PathResolverBaseTest.scala
101+
scala/tools/nsc/classpath/VirtualDirectoryClassPathTest.scala
102+
scala/tools/nsc/classpath/ZipAndJarFileLookupFactoryTest.scala
103+
scala/tools/nsc/doc/html/HtmlDocletTest.scala
104+
scala/tools/nsc/interpreter/CompletionTest.scala
105+
scala/tools/nsc/interpreter/ScriptedTest.scala
106+
scala/tools/nsc/interpreter/TabulatorTest.scala
107+
scala/tools/nsc/parser/ParserTest.scala
108+
scala/tools/nsc/reporters/ConsoleReporterTest.scala
109+
scala/tools/nsc/reporters/WConfTest.scala
110+
scala/tools/nsc/settings/ScalaVersionTest.scala
111+
scala/tools/nsc/settings/SettingsTest.scala
112+
scala/tools/nsc/settings/TargetTest.scala
113+
scala/tools/nsc/symtab/CannotHaveAttrsTest.scala
114+
scala/tools/nsc/symtab/FlagsTest.scala
115+
scala/tools/nsc/symtab/FreshNameExtractorTest.scala
116+
scala/tools/nsc/symtab/StdNamesTest.scala
117+
scala/tools/nsc/symtab/SymbolLoadersAssociatedFileTest.scala
118+
scala/tools/nsc/symtab/SymbolTableForUnitTesting.scala
119+
scala/tools/nsc/symtab/SymbolTableTest.scala
120+
scala/tools/nsc/symtab/classfile/PicklerTest.scala
121+
scala/tools/nsc/transform/MixinTest.scala
122+
scala/tools/nsc/transform/SpecializationTest.scala
123+
scala/tools/nsc/transform/ThicketTransformerTest.scala
124+
scala/tools/nsc/transform/delambdafy/DelambdafyTest.scala
125+
scala/tools/nsc/transform/patmat/SolvingTest.scala
126+
scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
127+
scala/tools/nsc/typechecker/Implicits.scala
128+
scala/tools/nsc/typechecker/NamerTest.scala
129+
scala/tools/nsc/typechecker/ParamAliasTest.scala
130+
scala/tools/nsc/typechecker/TreeAttachmentTest.scala
131+
scala/tools/nsc/typechecker/TypedTreeTest.scala
132+
scala/tools/nsc/util/StackTraceTest.scala
133+
scala/tools/testing/AllocationTest.scala
134+
scala/tools/testing/BytecodeTesting.scala
135+
scala/tools/testing/JOL.scala
136+
scala/tools/testing/RunTesting.scala
137+
scala/tools/testing/VirtualCompilerTesting.scala
138+
scala/util/matching/RegexTest.scala
139+
140+
## Do not link
141+
scala/MatchErrorSerializationTest.scala
142+
scala/PartialFunctionSerializationTest.scala
143+
scala/lang/stringinterpol/StringContextTest.scala
144+
scala/collection/IteratorTest.scala
145+
scala/collection/NewBuilderTest.scala
146+
scala/collection/ParallelConsistencyTest.scala
147+
scala/collection/SetMapRulesTest.scala
148+
scala/collection/SeqViewTest.scala
149+
scala/collection/SetMapConsistencyTest.scala
150+
scala/collection/concurrent/TrieMapTest.scala
151+
scala/collection/convert/WrapperSerializationTest.scala
152+
scala/collection/immutable/ListTest.scala
153+
scala/collection/immutable/RedBlackTreeSerialFormat.scala
154+
scala/collection/immutable/StreamTest.scala
155+
scala/collection/immutable/StringLikeTest.scala
156+
scala/collection/immutable/VectorTest.scala
157+
scala/collection/mutable/AnyRefMapTest.scala
158+
scala/collection/mutable/ArrayBufferTest.scala
159+
scala/collection/mutable/MutableListTest.scala
160+
scala/collection/mutable/OpenHashMapTest.scala
161+
scala/collection/mutable/PriorityQueueTest.scala
162+
scala/collection/parallel/TaskTest.scala
163+
scala/collection/parallel/immutable/ParRangeTest.scala
164+
scala/concurrent/FutureTest.scala
165+
scala/concurrent/duration/SerializationTest.scala
166+
scala/concurrent/impl/DefaultPromiseTest.scala
167+
scala/io/SourceTest.scala
168+
scala/runtime/ScalaRunTimeTest.scala
169+
scala/sys/process/PipedProcessTest.scala
170+
scala/sys/process/ProcessTest.scala
171+
scala/tools/testing/AssertUtilTest.scala
172+
scala/tools/testing/AssertThrowsTest.scala
173+
scala/util/SpecVersionTest.scala
174+
scala/util/SystemPropertiesTest.scala
175+
176+
## Tests fail
177+
178+
# Reflection
179+
scala/reflect/ClassTagTest.scala
180+
181+
# Require strict-floats
182+
scala/math/BigDecimalTest.scala
183+
184+
# Difference of getClass() on primitive values
185+
scala/collection/immutable/RangeTest.scala
186+
187+
# Test fails only some times with
188+
# 'set scalaJSOptimizerOptions in scalaTestSuite ~= (_.withDisableOptimizer(true))'
189+
# and' 'set scalaJSUseRhino in Global := false'
190+
scala/collection/immutable/PagedSeqTest.scala
191+
192+
# Bugs
193+
scala/collection/convert/MapWrapperTest.scala
194+
195+
# Tests passed but are too slow (timeouts)
196+
scala/collection/immutable/ListSetTest.scala
197+
scala/util/SortingTest.scala

0 commit comments

Comments
 (0)
0