update Using from Scala 2.13.17 and add UsingTest#712
Merged
SethTisue merged 3 commits intoscala:mainfrom Oct 7, 2025
Merged
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
6778be7 to
6b7bd33
Compare
fixes scala#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...)
6b7bd33 to
e040b46
Compare
Member
Author
|
I'm going to go ahead and merge and release this on my own authority, since we want to have a new version available at the same time that 2.13.17 is announced. I will mention the upgrade in the 2.13.17 release notes. |
Member
Author
|
followup to fix publishing: #714 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ports scala/scala#11000
fixes #692
sequel to @NthPortal's #319
I was tempted to drop Scala 2.11, but in the end I was able to keep it in the build by special-casing it to use an older Scala.js version
I also had to do a bit of monkey business in the build for the tests to pass on Scala 3 even though Scala 3 hasn't taken the 2.13.17 upgrade yet. Once they take it, the monkey business can be removed and
UsingTest.scalacan be moved out ofsrc-jvmand intosrc(since for some reason, the monkey business only worked on the JVM, not JS or Native).