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.

Sign up for GitHub

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

build(deps): Update mdoc, mdoc-interfaces, sbt-mdoc from 2.4.0 to 2.5.0 #5823

Merged
merged 2 commits into from
Nov 17, 2023
Merged

build(deps): Update mdoc, mdoc-interfaces, sbt-mdoc from 2.4.0 to 2.5.0 #5823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e7465c
build(deps): Update mdoc, mdoc-interfaces, sbt-mdoc from 2.4.0 to 2.5.0
scalameta-bot Nov 10, 2023
908a92b
bugfix: Pin mdoc versions for different Scala versions and JDK ones
tgodzik Nov 10, 2023
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
9 changes: 9 additions & 0 deletions metals/src/main/scala/scala/meta/internal/metals/Embedded.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import java.nio.file.Path
import java.util.ServiceLoader

import scala.collection.concurrent.TrieMap
import scala.util.Properties

import scala.meta.internal.metals.MetalsEnrichments._
import scala.meta.internal.pc.ScalaPresentationCompiler
Expand Down Expand Up @@ -170,6 +171,7 @@ final class Embedded(
}

object Embedded {
private val jdkVersion = JdkVersion.parse(Properties.javaVersion)

lazy val repositories: List[Repository] =
Repository.defaults().asScala.toList ++
Expand Down Expand Up @@ -270,6 +272,13 @@ object Embedded {
if (scalaBinaryVersion == "2.11") "2.2.24"
// from 2.2.24 mdoc is compiled with 3.1.x which is incompatible with 3.0.x
else if (scalaVersion.exists(_.startsWith("3.0"))) "2.2.23"
// from 2.4.0 mdoc is released with Scala LTS 3.3.x
else if (
scalaVersion.exists(_.startsWith("3.1")) ||
scalaVersion.exists(_.startsWith("3.2"))
) "2.3.8"
// from 2.5.0 mdoc is released with JDK 11
else if (jdkVersion.exists(_.major < 11)) "2.4.0"
else BuildInfo.mdocVersion,
)
}
Expand Down
2 changes: 1 addition & 1 deletion project/V.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object V {
val lsp4jV = "0.20.1"
val mavenBloop = "2.0.0"
val mill = "0.11.5"
val mdoc = "2.4.0"
val mdoc = "2.5.1"
val munit = "1.0.0-M10"
val pprint = "0.7.3"
val sbtBloop = bloop
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.3.2")

Expand Down
Loading