Skip to content

Commit

Permalink
Scala 2.13.15 (was .14)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SethTisue
SethTisue committed Oct 11, 2024
1 parent 46f4860 commit efcfc76
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
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
+68 −43 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
10 changes: 5 additions & 5 deletions project/Build.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,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"
}

/** Version of the scala-library for which we will generate TASTy.
Expand All @@ -160,7 +160,7 @@ object Build {
* We can use nightly versions to tests the future compatibility in development.
* Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang
*/
val stdlibBootstrappedVersion = "2.13.14"
val stdlibBootstrappedVersion = "2.13.15"

val dottyOrganization = "org.scala-lang"
val dottyGithubUrl = "https://github.com/scala/scala3"
Expand Down Expand Up @@ -1405,7 +1405,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 @@ -1415,7 +1415,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"),
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings
Expand Down

0 comments on commit efcfc76

Please sign in to comment.