Commit 1afcb76
committed
update
fixes #692
includes Scala upgrades: Scala 2.13.17, 2.12.20 (was .13, .19),
Scala.js (because only latest Scala.js is available for 2.13.17,
as per Seb on the contributors forum)
copies the sources from scala/scala repo, reformatted using scalafmt
both `Using` and `UsingTest` needed slight adjustment to compile on
2.11 and 2.12; and `UsingTest` needed to be adjusted to use
scala.util.control.compat.ControlThrowable
I tried to get `UsingTest` passing on Scala 3. on the JVM, this was
sufficient to get the 2.13.17 stdlib so that the tests pass:
dependencyOverrides += "org.scala-lang" % "scala-library" % scala213
but it doesn't do the trick on JS or Native for reasons unknown.
so I worked around by putting `UsingTest` under `src-jvm`.
once we are on a Scala 3.3 LTS version that has taken the 2.13.17
upgrade, it could be moved to regular `src`. (but anyway, who cares...)Using from Scala 2.13.17 and add UsingTest
1 parent 484a621 commit 1afcb76
File tree
5 files changed
+718
-693
lines changed- compat/src
- main
- scala-2.11/scala/util
- scala-2.12/scala/util
- test/scala-jvm/test/scala/util
- project
5 files changed
+718
-693
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | | - | |
| 53 | + | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
66 | 76 | | |
67 | 77 | | |
68 | 78 | | |
| |||
0 commit comments