Skip to content

Commit e524dcc

Browse files
Merge pull request #18 from scala/backport-lts-3.3-21648
Backport "Scala 2.13.15 (was .14)" to LTS
2 parents 6f93d4e + e056059 commit e524dcc

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
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
@@ -492,8 +492,8 @@ object projects:
492492

493493
lazy val scalaCollectionCompat = SbtCommunityProject(
494494
project = "scala-collection-compat",
495-
sbtTestCommand = "compat30/test",
496-
sbtPublishCommand = "compat30/publishLocal",
495+
sbtTestCommand = "compat3/test",
496+
sbtPublishCommand = "compat3/publishLocal",
497497
)
498498

499499
lazy val scalaJava8Compat = SbtCommunityProject(

project/Build.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ object Build {
124124
* scala-library.
125125
*/
126126
def stdlibVersion(implicit mode: Mode): String = mode match {
127-
case NonBootstrapped => "2.13.14"
128-
case Bootstrapped => "2.13.14"
127+
case NonBootstrapped => "2.13.15"
128+
case Bootstrapped => "2.13.15"
129129
}
130130

131131
val dottyOrganization = "org.scala-lang"
@@ -1150,7 +1150,7 @@ object Build {
11501150
BuildInfoPlugin.buildInfoDefaultSettings
11511151

11521152
lazy val presentationCompilerSettings = {
1153-
val mtagsVersion = "1.3.4"
1153+
val mtagsVersion = "1.3.5"
11541154
Seq(
11551155
libraryDependencies ++= Seq(
11561156
"org.lz4" % "lz4-java" % "1.8.0",
@@ -1160,7 +1160,7 @@ object Build {
11601160
.exclude("org.eclipse.lsp4j","org.eclipse.lsp4j.jsonrpc"),
11611161
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.20.1",
11621162
),
1163-
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.14" % mtagsVersion % SourceDeps),
1163+
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.15" % mtagsVersion % SourceDeps),
11641164
ivyConfigurations += SourceDeps.hide,
11651165
transitiveClassifiers := Seq("sources"),
11661166
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Ysafe-init"),

0 commit comments

Comments
 (0)