Skip to content
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

Backport "Scala 2.13.15 (was .14)" to LTS #18

Merged
merged 1 commit into from
Dec 6, 2024
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
2 changes: 1 addition & 1 deletion community-build/community-projects/scala-collection-compat
Submodule scala-collection-compat updated 69 files
+2 −0 .git-blame-ignore-revs
+22 −22 .github/workflows/ci.yml
+1 −0 .jvmopts
+2 −0 .mailmap
+12 −0 .scala-steward.conf
+11 −6 .scalafmt.conf
+2 −2 NOTICE
+36 −19 README.md
+2 −2 admin/scalafmt.sh
+1 −1 binary-compat/test/src/test/scala/BinaryCompaTest.scala
+67 −38 build.sbt
+65 −0 compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+121 −0 compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+74 −0 compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
+4 −4 compat/src/main/scala-2.11/scala/collection/compat/package.scala
+65 −0 compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
+409 −0 compat/src/main/scala-2.11/scala/util/Using.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
+4 −4 compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+160 −14 compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+36 −0 compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
+320 −0 compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
+59 −55 compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
+71 −57 compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
+3 −2 compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
+30 −0 compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
+5 −5 compat/src/main/scala-2.12/scala/collection/compat/package.scala
+65 −0 compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
+6 −6 compat/src/main/scala-2.12/scala/util/Using.scala
+18 −0 compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
+55 −0 compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
+89 −5 compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
+37 −0 compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
+97 −0 compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
+128 −0 compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
+24 −0 compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
+20 −20 compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
+165 −135 compat/src/test/scala/scala/util/UsingTest.scala
+26 −0 compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
+7 −0 compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
+49 −0 compat/src/test/scala/test/scala/collection/AssertThrown.scala
+34 −34 compat/src/test/scala/test/scala/collection/BuildFromTest.scala
+60 −16 compat/src/test/scala/test/scala/collection/CollectionTest.scala
+6 −3 compat/src/test/scala/test/scala/collection/FactoryTest.scala
+63 −52 compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
+14 −12 compat/src/test/scala/test/scala/collection/LazyListTest.scala
+5 −5 compat/src/test/scala/test/scala/collection/LazyZipTest.scala
+5 −5 compat/src/test/scala/test/scala/collection/MapTest.scala
+10 −38 compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
+48 −0 compat/src/test/scala/test/scala/collection/OptionTest.scala
+3 −3 compat/src/test/scala/test/scala/collection/QueueTest.scala
+45 −1 compat/src/test/scala/test/scala/collection/SortedTest.scala
+305 −0 compat/src/test/scala/test/scala/collection/StringParsersTest.scala
+2 −2 compat/src/test/scala/test/scala/collection/ViewTest.scala
+34 −0 compat/src/test/scala/test/scala/util/RandomTest.scala
+12 −8 project/MultiScalaProject.scala
+13 −18 project/Version.scala
+1 −1 project/build.properties
+7 −7 project/plugins.sbt
+11 −11 scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
+52 −41 scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
+24 −24 scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
+3 −2 scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
+24 −22 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
+3 −3 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
+3 −3 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
+44 −41 scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
+23 −23 scalafix/rules/src/main/scala/scala/fix/collection/package.scala
+1 −1 scalafix/tests/src/test/scala/fix/ScalafixTests.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/stdLib213
Submodule stdLib213 updated 1560 files
4 changes: 2 additions & 2 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,8 @@ object projects:

lazy val scalaCollectionCompat = SbtCommunityProject(
project = "scala-collection-compat",
sbtTestCommand = "compat30/test",
sbtPublishCommand = "compat30/publishLocal",
sbtTestCommand = "compat3/test",
sbtPublishCommand = "compat3/publishLocal",
)

lazy val scalaJava8Compat = SbtCommunityProject(
Expand Down
8 changes: 4 additions & 4 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ object Build {
* scala-library.
*/
def stdlibVersion(implicit mode: Mode): String = mode match {
case NonBootstrapped => "2.13.14"
case Bootstrapped => "2.13.14"
case NonBootstrapped => "2.13.15"
case Bootstrapped => "2.13.15"
}

val dottyOrganization = "org.scala-lang"
Expand Down Expand Up @@ -1150,7 +1150,7 @@ object Build {
BuildInfoPlugin.buildInfoDefaultSettings

lazy val presentationCompilerSettings = {
val mtagsVersion = "1.3.4"
val mtagsVersion = "1.3.5"
Seq(
libraryDependencies ++= Seq(
"org.lz4" % "lz4-java" % "1.8.0",
Expand All @@ -1160,7 +1160,7 @@ object Build {
.exclude("org.eclipse.lsp4j","org.eclipse.lsp4j.jsonrpc"),
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.20.1",
),
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.14" % mtagsVersion % SourceDeps),
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.15" % mtagsVersion % SourceDeps),
ivyConfigurations += SourceDeps.hide,
transitiveClassifiers := Seq("sources"),
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Ysafe-init"),
Expand Down
Loading