Skip to content
This repository has been archived by the owner on Sep 25, 2020. It is now read-only.

Commit

Permalink
fix wrong dependencies
Browse files Browse the repository at this point in the history
Commit d4087ed tried to cut down package sizes, which it did, but it
also set up the dependencies wrong, so that the PIDE implementations
were useless.
  • Loading branch information
larsrh committed Jun 30, 2018
1 parent d2b7cde commit 27a2c85
Showing 1 changed file with 11 additions and 20 deletions.
31 changes: 11 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ lazy val root = project.in(file("."))
pideInterface, libisabelle, setup,
tests, docs, examples,
cli,
pideDependencies,
pideAggregate,
pidePackage,
workbench
Expand Down Expand Up @@ -157,7 +156,15 @@ lazy val pideInterface = project.in(file("modules/pide-interface"))
libraryDependencies ++= Seq(
"com.chuusai" %% "shapeless" % "2.3.3",
"io.monix" %% "monix-execution" % "3.0.0-RC1",
"org.log4s" %% "log4s" % "1.6.1"
"org.log4s" %% "log4s" % "1.6.1",
// the dependencies below are not strictly necessary for pide-interface,
// but all non-generic PIDE implementations require them
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
"org.tukaani" % "xz" % "1.8",
"com.jcraft" % "jsch" % "0.1.54",
"com.jcraft" % "jzlib" % "1.1.3",
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"org.xerial" % "sqlite-jdbc" % "3.23.1"
)
)

Expand Down Expand Up @@ -202,24 +209,8 @@ lazy val setup = project.in(file("modules/setup"))

lazy val pideVersion = settingKey[Version]("PIDE version")

lazy val pideDependencies = project.in(file("modules/pide-dependencies"))
.dependsOn(pideInterface)
.settings(moduleName := "pide-dependencies")
.settings(standardSettings)
.enablePlugins(GitVersioning)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
"org.tukaani" % "xz" % "1.8",
"com.jcraft" % "jsch" % "0.1.54",
"com.jcraft" % "jzlib" % "1.1.3",
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"org.xerial" % "sqlite-jdbc" % "3.23.1"
)
)

def pide(version: String) = Project(s"pide$version", file(s"modules/pide/$version"))
.dependsOn(pideDependencies % "provided")
.dependsOn(pideInterface % "provided")
.settings(moduleName := s"pide-$version")
.settings(standardSettings)
.enablePlugins(GitVersioning, BuildInfoPlugin)
Expand Down Expand Up @@ -258,7 +249,7 @@ def assemblyGenerator(p: Project) = Def.task {
}

lazy val pidePackage = project.in(file("modules/pide-package"))
.dependsOn(pideDependencies)
.dependsOn(pideInterface)
.settings(moduleName := "pide-package")
.settings(standardSettings)
.settings(
Expand Down

0 comments on commit 27a2c85

Please sign in to comment.