Skip to content

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented Sep 30, 2025

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.scala can be moved out of src-jvm and into src (since for some reason, the monkey business only worked on the JVM, not JS or Native).

@SethTisue SethTisue self-assigned this Sep 30, 2025
@SethTisue

This comment was marked as outdated.

@SethTisue

This comment was marked as outdated.

@SethTisue SethTisue force-pushed the using-2.13.17 branch 8 times, most recently from 6778be7 to 6b7bd33 Compare October 7, 2025 00:29
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...)
@SethTisue
Copy link
Member Author

SethTisue commented Oct 7, 2025

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.

@SethTisue SethTisue merged commit f5072c8 into scala:main Oct 7, 2025
25 checks passed
@SethTisue SethTisue deleted the using-2.13.17 branch October 7, 2025 00:37
@SethTisue
Copy link
Member Author

followup to fix publishing: #714

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant