Skip to content

Commit 9c350f3

Browse files
Backport "Scala 2.13.15 (was .14)" to 3.6.0 (#21776)
Backports #21648 to 3.6.0-RC1 --------- Co-authored-by: Seth Tisue <[email protected]>
1 parent bb9389b commit 9c350f3

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed
Submodule stdLib213 updated 1560 files

community-build/src/scala/dotty/communitybuild/projects.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ object projects:
489489

490490
lazy val scalaCollectionCompat = SbtCommunityProject(
491491
project = "scala-collection-compat",
492-
sbtTestCommand = "compat30/test",
493-
sbtPublishCommand = "compat30/publishLocal",
492+
sbtTestCommand = "compat3/test",
493+
sbtPublishCommand = "compat3/publishLocal",
494494
)
495495

496496
lazy val scalaJava8Compat = SbtCommunityProject(

project/Build.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ object Build {
149149
* scala-library.
150150
*/
151151
def stdlibVersion(implicit mode: Mode): String = mode match {
152-
case NonBootstrapped => "2.13.14"
153-
case Bootstrapped => "2.13.14"
152+
case NonBootstrapped => "2.13.15"
153+
case Bootstrapped => "2.13.15"
154154
}
155155

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

165165
val dottyOrganization = "org.scala-lang"
166166
val dottyGithubUrl = "https://github.com/scala/scala3"
@@ -1405,7 +1405,7 @@ object Build {
14051405
BuildInfoPlugin.buildInfoDefaultSettings
14061406

14071407
lazy val presentationCompilerSettings = {
1408-
val mtagsVersion = "1.3.4"
1408+
val mtagsVersion = "1.3.5"
14091409
Seq(
14101410
libraryDependencies ++= Seq(
14111411
"org.lz4" % "lz4-java" % "1.8.0",
@@ -1415,7 +1415,7 @@ object Build {
14151415
.exclude("org.eclipse.lsp4j","org.eclipse.lsp4j.jsonrpc"),
14161416
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.20.1",
14171417
),
1418-
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.14" % mtagsVersion % SourceDeps),
1418+
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.15" % mtagsVersion % SourceDeps),
14191419
ivyConfigurations += SourceDeps.hide,
14201420
transitiveClassifiers := Seq("sources"),
14211421
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings

0 commit comments

Comments
 (0)