Switch to metabrowse 0.2.3

almond-sh · Nov 28, 2019 · f7819cf00ea1f30a741386602949aca2b3e88656 · f7819cf
1 parent c3ddf55
commit f7819cf00ea1f30a741386602949aca2b3e88656
diff --git a/build.sbt b/build.sbt
@@ -141,23 +141,13 @@ lazy val `scala-interpreter` = project
   .dependsOn(interpreter, `scala-kernel-api`, kernel % "test->test", `almond-rx` % Test)
   .settings(
     shared,
-    libraryDependencies ++= {
-      val sv = scalaVersion.value
-      if (sv.startsWith("2.12.")) {
-        val patch = sv.stripPrefix("2.12.").takeWhile(_.isDigit).toInt
-        if (patch <= 8)
-          Seq(Deps.metabrowseServer)
-        else
-          Nil
-      } else
-        Nil
-    },
     libraryDependencies ++= Seq(
+      Deps.ammoniteRepl.value,
       Deps.coursier,
       Deps.coursierApi,
       Deps.directories,
       Deps.jansi,
-      Deps.ammoniteRepl.value
+      Deps.metabrowseServer
     ),
     crossVersion := CrossVersion.full,
     testSettings

diff --git a/...ala-interpreter/src/main/scala-2.12.9+/almond/internals/ScalaInterpreterInspections.scala b/...ala-interpreter/src/main/scala-2.12.9+/almond/internals/ScalaInterpreterInspections.scala
diff --git a/.../scala-interpreter/src/main/scala-2.13/almond/internals/ScalaInterpreterInspections.scala b/.../scala-interpreter/src/main/scala-2.13/almond/internals/ScalaInterpreterInspections.scala
diff --git a/...ternals/ScalaInterpreterInspections.scala → ...ternals/ScalaInterpreterInspections.scala b/...ternals/ScalaInterpreterInspections.scala → ...ternals/ScalaInterpreterInspections.scala
diff --git a/project/Deps.scala b/project/Deps.scala
@@ -25,11 +25,11 @@ object Deps {
   def jsoniterScalaCore = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % Versions.jsoniterScala
   def jsoniterScalaMacros = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % Versions.jsoniterScala
   def jvmRepr = "com.github.jupyter" % "jvm-repr" % "0.4.0"
-  def metabrowseServer = "org.scalameta" %% "metabrowse-server" % "0.2.2"
+  def metabrowseServer = "org.scalameta" %% "metabrowse-server" % "0.2.3"
   def scalaReflect = setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
   def scalaRx = "com.lihaoyi" %% "scalarx" % "0.4.0"
   def scalatags = "com.lihaoyi" %% "scalatags" % "0.7.0"
-  def slf4jNop = "org.slf4j" % "slf4j-nop" % "1.7.28"
+  def slf4jNop = "org.slf4j" % "slf4j-nop" % "1.8.0-beta4"
 
   def sparkSql = "org.apache.spark" %% "spark-sql" % "2.4.0"