Commit 44b83e58 authored by Romain Reuillon's avatar Romain Reuillon
Browse files

[Lib] fix: shapeless bundle.

parent f50e0531
......@@ -36,8 +36,11 @@ lazy val json4s = OsgiProject(dir, "org.json4s",
libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.5.0",
version := "3.5.0") settings(settings: _*)
lazy val shapeless = "com.chuusai" %% "shapeless" % "2.3.2"
lazy val shapelessVersion = "2.3.2"
lazy val shapeless = OsgiProject(dir, "com.chuusai.shapeless", exports = Seq("shapeless.*")) settings (
libraryDependencies += "com.chuusai" %% "shapeless" % shapelessVersion,
version := shapelessVersion
) settings(settings: _*)
lazy val circeVersion = "0.9.0"
lazy val circe = OsgiProject(dir, "io.circe",
......@@ -51,8 +54,7 @@ lazy val circe = OsgiProject(dir, "io.circe",
"io.circe" %% "circe-generic-extras",
"io.circe" %% "circe-parser"
).map(_ % circeVersion),
libraryDependencies += shapeless,
version := circeVersion) settings(settings: _*)
version := circeVersion) settings(settings: _*) dependsOn(shapeless)
lazy val logback = OsgiProject(dir, "ch.qos.logback", exports = Seq("ch.qos.logback.*", "org.slf4j.impl"), dynamicImports = Seq("*")) settings
(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.9", version := "1.0.9") settings(settings: _*)
......@@ -317,9 +319,8 @@ lazy val monocle = OsgiProject(dir, "monocle",
"com.github.julien-truffaut" %% "monocle-generic",
"com.github.julien-truffaut" %% "monocle-macro"
).map(_ % monocleVersion),
libraryDependencies += shapeless,
version := monocleVersion
) settings(settings: _*)
) settings(settings: _*) dependsOn(shapeless)
val asmVersion = "5.1"
......
......@@ -664,7 +664,7 @@ def binDir = file("bin")
def bundleFilter(m: ModuleID, artifact: Artifact) = {
def excludedLibraryDependencies = Set("slick", "squants")
def excludedLibraryDependencies = Set("slick", "squants", "shapeless")
def exclude =
(m.organization != "org.openmole.library" && excludedLibraryDependencies.exists(m.name.contains)) ||
......
......@@ -122,6 +122,6 @@ object Libraries {
lazy val equinoxOSGi = "org.eclipse.tycho" % "org.eclipse.osgi" % "3.12.1.v20170821-1548"
lazy val osgiCompendium = "org.osgi" % "org.osgi.compendium" % "4.3.1"
lazy val shapeless = "com.chuusai" %% "shapeless" % "2.3.2"
lazy val shapeless = "org.openmole.library" %% "com-chuusai-shapeless" % "2.3.2"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment