Skip to content
Permalink
Browse files

Merge pull request #468 from alexarchambault/metabrowse-0.2.3

Switch to metabrowse 0.2.3
  • Loading branch information
alexarchambault committed Nov 28, 2019
2 parents c3ddf55 + 41a8ac7 commit 34de2fd1e3e9ea82425199976be95bd4e21b5938
@@ -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

This file was deleted.

This file was deleted.

@@ -42,8 +42,8 @@ final case class Options(
// only sees the api module and its dependencies, rather than the full classpath of almond.
@HelpMessage("Use class loader that loaded the api module rather than the context class loader")
specificLoader: Boolean = true,
@HelpMessage("Start a metabrowse server for go to source navigation (linked from Jupyter inspections)")
metabrowse: Boolean = false,
@HelpMessage("Start a metabrowse server for go to source navigation (linked from Jupyter inspections, server is started upon first inspection)")
metabrowse: Boolean = true,
@HelpMessage("Trap what user code sends to stdout and stderr")
trapOutput: Boolean = false,
@HelpMessage("Disable ammonite compilation cache")
@@ -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"

0 comments on commit 34de2fd

Please sign in to comment.
You can’t perform that action at this time.