Commit f06c56d1 authored by Romain Reuillon's avatar Romain Reuillon
Browse files

[Plugin] fix: get rid of evolution.data package in evolution bundle

parent 56eb1d5a
Pipeline #1221 running with stages
......@@ -29,6 +29,7 @@ object OsgiProject {
artifactId: String,
exports: Seq[String] = Seq(),
privatePackages: Seq[String] = Seq(),
excludeSubPackage: Seq[String] = Seq(),
singleton: Boolean = false,
settings: Seq[Setting[_]] = Nil,
bundleActivator: Option[String] = None,
......@@ -39,6 +40,8 @@ object OsgiProject {
val base = directory / artifactId
val exportedPackages = if (exports.isEmpty) Seq(artifactId + ".*") else exports
val privatePackageValue = excludeSubPackage.map(p => s"!$artifactId.$p.*") ++ privatePackages
Project(artifactId.replace('.', '-'), base).settings(settings: _*).enablePlugins(SbtOsgi).settings(osgiSettings: _*).settings(
name := artifactId,
Osgi.singleton := singleton,
......@@ -53,7 +56,7 @@ object OsgiProject {
}).value,
OsgiKeys.requireCapability := """osgi.ee; osgi.ee="JavaSE";version:List="1.8,1.9""""",
//OsgiKeys.bundleRequiredExecutionEnvironment := Seq("JavaSE-1.8", "JavaSE-1.9"),
OsgiKeys.privatePackage := privatePackages,
OsgiKeys.privatePackage := privatePackageValue,
OsgiKeys.dynamicImportPackage := dynamicImports,
OsgiKeys.importPackage := imports,
OsgiKeys.bundleActivator := (OsgiKeys.bundleActivator { bA bundleActivator.orElse(bA) }).value)
......
......@@ -473,7 +473,7 @@ lazy val omrHook = OsgiProject(pluginDir, "org.openmole.plugin.hook.omr", import
def allMethod = Seq(evolution, directSampling, sensitivity, abc)
lazy val evolution = OsgiProject(pluginDir, "org.openmole.plugin.method.evolution", imports = Seq("*")) dependsOn(
lazy val evolution = OsgiProject(pluginDir, "org.openmole.plugin.method.evolution", imports = Seq("*"), excludeSubPackage = Seq("data")) dependsOn(
openmoleDSL, toolsTask, pattern, evolutionData, collectionDomain % "test", boundsDomain % "test"
) settings(
libraryDependencies += Libraries.mgo,
......
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