Skip to content

Commit

Permalink
Merge pull request #445 from tgodzik/fix-mdoc
Browse files Browse the repository at this point in the history
Update scala 2.12 to 2.12.13
  • Loading branch information
tgodzik authored Jan 16, 2021
2 parents 292c47a + b3f96da commit 292e363
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
java: [adopt@1.8, adopt@1.11]
command:
- "'++2.11.12 test'"
- "'++2.12.12 test' scripted"
- "'++2.12.13 test' scripted"
- "'++2.13.4 test'"
- "'++3.0.0-M2 test'"
- "'++3.0.0-M3 test'"
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import scala.collection.mutable

def scala212 = "2.12.12"
def scala212 = "2.12.13"
def scala211 = "2.11.12"
def scala213 = "2.13.4"
def scala3 = List("3.0.0-M3", "3.0.0-M2")
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion.in(ThisBuild) := "2.12.8"
scalaVersion.in(ThisBuild) := "2.12.13"

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package mdoc.internal.markdown

import scala.tools.nsc.Settings
import scala.tools.nsc.reporters.AbstractReporter
import scala.tools.nsc.reporters.FilteringReporter
import scala.reflect.internal.util.Position

trait VersionSpecificFilteringReporter extends AbstractReporter { self: FilterStoreReporter =>
override def display(pos: Position, msg: String, severity: Severity): Unit =
trait VersionSpecificFilteringReporter extends FilteringReporter { self: FilterStoreReporter =>
override def doReport(pos: Position, msg: String, severity: Severity): Unit =
add(pos, msg, severity)
override def displayPrompt(): Unit = ()
}

0 comments on commit 292e363

Please sign in to comment.