Skip to content

Commit 1f2187d

Browse files
authored
Add Scala 3.1.0 support (#568)
1 parent a897826 commit 1f2187d

File tree

7 files changed

+7
-14
lines changed

7 files changed

+7
-14
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- "'++2.12.12 test'"
4545
- "'++2.12.14 test' scripted"
4646
- "'++2.13.6 test'"
47-
- "'++3.0.1 test'"
47+
- "'++3.1.0 test'"
4848
steps:
4949
- uses: actions/checkout@v2
5050
- uses: olafurpg/setup-scala@v13

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ out/
3030
.bloop/
3131
metals.sbt
3232
.vscode/
33+
.bsp
3334

3435
website/translated_docs
3536
website/build/

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import scala.collection.mutable
33
def scala212 = "2.12.15"
44
def scala211 = "2.11.12"
55
def scala213 = "2.13.6"
6-
def scala3 = "3.0.2"
6+
def scala3 = "3.1.0"
77
def scala2Versions = List(scala212, scala211, scala213)
88
def allScalaVersions = scala2Versions :+ scala3
99

10-
def scalajs = "1.5.1"
10+
def scalajs = "1.7.1"
1111
def scalajsBinaryVersion = "1"
1212
def scalajsDom = "1.1.0"
1313

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
22
addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
33
addSbtCoursier

mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class MarkdownCompiler(
124124
report(vreporter, input, fileImports, run.runContext, edit)
125125
}
126126

127-
class CollectionReporter extends dotty.tools.dotc.reporting.Reporter {
127+
class CollectionReporter extends dotty.tools.dotc.reporting.Reporter with UniqueMessagePositions {
128128
val allDiags = List.newBuilder[Diagnostic]
129129

130130
override def doReport(dia: Diagnostic)(using Context) =

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
22
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
33
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
55
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
66

77
libraryDependencies ++= List(

tests/unit-js/src/test/scala/tests/js/JsSuite.scala

-8
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,6 @@ class JsSuite extends BaseMarkdownSuite {
300300
|no-dom.md:3 (mdoc generated code)
301301
| value scalajs is not a member of org
302302
|def run0(node: _root_.org.scalajs.dom.raw.HTMLElement): Unit = {
303-
|
304-
|
305-
|error:
306-
|no-dom.md:3 (mdoc generated code)
307-
| (<error value scalajs is not a member of org>#dom.raw :
308-
| <error value scalajs is not a member of org>
309-
|) is not a valid type prefix, since it is not an immutable path
310-
|def run0(node: _root_.org.scalajs.dom.raw.HTMLElement): Unit = {
311303
""".stripMargin
312304
)
313305
)

0 commit comments

Comments
 (0)