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

[Build] fix: use scalaVersion variable.

parent 2356b762
......@@ -69,13 +69,13 @@ lazy val openmoleLogger = OsgiProject(thirdPartiesDir, "org.openmole.tool.logger
lazy val openmoleThread = OsgiProject(thirdPartiesDir, "org.openmole.tool.thread", imports = Seq("*")) dependsOn(openmoleLogger, openmoleCollection) settings (thirdPartiesSettings: _*) settings (libraryDependencies += Libraries.squants)
lazy val openmoleHash = OsgiProject(thirdPartiesDir, "org.openmole.tool.hash", imports = Seq("*")) dependsOn(openmoleFile, openmoleStream) settings (thirdPartiesSettings: _*)
lazy val openmoleStream = OsgiProject(thirdPartiesDir, "org.openmole.tool.stream", imports = Seq("*")) dependsOn (openmoleThread) settings(libraryDependencies += Libraries.collections, libraryDependencies += Libraries.squants) settings (thirdPartiesSettings: _*)
lazy val openmoleCollection = OsgiProject(thirdPartiesDir, "org.openmole.tool.collection", imports = Seq("*")) settings (libraryDependencies += Libraries.scalaLang) settings (thirdPartiesSettings: _*)
lazy val openmoleCollection = OsgiProject(thirdPartiesDir, "org.openmole.tool.collection", imports = Seq("*")) settings (Libraries.addScalaLang) settings (thirdPartiesSettings: _*)
lazy val openmoleCrypto = OsgiProject(thirdPartiesDir, "org.openmole.tool.crypto", imports = Seq("*")) settings(libraryDependencies += Libraries.bouncyCastle, libraryDependencies += Libraries.jasypt) settings (thirdPartiesSettings: _*)
lazy val openmoleStatistics = OsgiProject(thirdPartiesDir, "org.openmole.tool.statistics", imports = Seq("*")) dependsOn (openmoleLogger) settings (thirdPartiesSettings: _*)
lazy val openmoleTypes = OsgiProject(thirdPartiesDir, "org.openmole.tool.types", imports = Seq("*")) settings(libraryDependencies += Libraries.shapeless, libraryDependencies += Libraries.squants) settings (thirdPartiesSettings: _*)
lazy val openmoleByteCode = OsgiProject(thirdPartiesDir, "org.openmole.tool.bytecode", imports = Seq("*")) settings (libraryDependencies += Libraries.asm) settings (thirdPartiesSettings: _*)
lazy val openmoleOSGi = OsgiProject(thirdPartiesDir, "org.openmole.tool.osgi", imports = Seq("*")) dependsOn (openmoleFile) settings (libraryDependencies += Libraries.equinoxOSGi) settings (thirdPartiesSettings: _*)
lazy val openmoleRandom = OsgiProject(thirdPartiesDir, "org.openmole.tool.random", imports = Seq("*")) settings (thirdPartiesSettings: _*) settings(libraryDependencies += Libraries.math, libraryDependencies += Libraries.scalaLang) dependsOn (openmoleCache)
lazy val openmoleRandom = OsgiProject(thirdPartiesDir, "org.openmole.tool.random", imports = Seq("*")) settings (thirdPartiesSettings: _*) settings(libraryDependencies += Libraries.math, Libraries.addScalaLang) dependsOn (openmoleCache)
lazy val openmoleNetwork = OsgiProject(thirdPartiesDir, "org.openmole.tool.network", imports = Seq("*")) settings (thirdPartiesSettings: _*)
lazy val txtmark = OsgiProject(thirdPartiesDir, "com.quandora.txtmark", exports = Seq("com.github.rjeschke.txtmark.*"), imports = Seq("*")) settings (thirdPartiesSettings: _*)
......@@ -132,7 +132,8 @@ lazy val expansion = OsgiProject(coreDir, "org.openmole.core.expansion", imports
) dependsOn(context, tools, openmoleRandom, openmoleFile, pluginManager, console) settings (coreSettings: _*)
lazy val workflow = OsgiProject(coreDir, "org.openmole.core.workflow", imports = Seq("*")) settings(
libraryDependencies ++= Seq(Libraries.scalaLang, Libraries.math, Libraries.cats, Libraries.equinoxOSGi, Libraries.shapeless),
libraryDependencies ++= Seq(Libraries.math, Libraries.cats, Libraries.equinoxOSGi, Libraries.shapeless),
Libraries.addScalaLang,
defaultActivator
) dependsOn(
event,
......@@ -161,7 +162,7 @@ lazy val openmoleDSL = OsgiProject(coreDir, "org.openmole.core.dsl", imports = S
lazy val exception = OsgiProject(coreDir, "org.openmole.core.exception", imports = Seq("*")) settings (coreSettings: _*)
lazy val tools = OsgiProject(coreDir, "org.openmole.core.tools", global = true, imports = Seq("*")) settings
(libraryDependencies ++= Seq(Libraries.xstream, Libraries.exec, Libraries.math, Libraries.scalaLang, Libraries.scalatest, Libraries.equinoxOSGi)) dependsOn
(libraryDependencies ++= Seq(Libraries.xstream, Libraries.exec, Libraries.math, Libraries.scalatest, Libraries.equinoxOSGi), Libraries.addScalaLang) dependsOn
(exception, openmoleTar, openmoleFile, openmoleLock, openmoleThread, openmoleHash, openmoleLogger, openmoleStream, openmoleCollection, openmoleStatistics, openmoleTypes, openmoleCache, openmoleRandom, openmoleNetwork) settings (coreSettings: _*)
lazy val event = OsgiProject(coreDir, "org.openmole.core.event", imports = Seq("*")) dependsOn (tools) settings (coreSettings: _*)
......@@ -173,7 +174,7 @@ lazy val db = OsgiProject(coreDir, "org.openmole.core.db", imports = Seq("*")) s
libraryDependencies ++= Seq(Libraries.slick, Libraries.xstream, Libraries.h2, Libraries.scopt)) settings (coreSettings: _*) dependsOn(openmoleNetwork, exception, openmoleCrypto, openmoleFile, openmoleLogger)
lazy val preference = OsgiProject(coreDir, "org.openmole.core.preference", imports = Seq("*")) settings (
libraryDependencies ++= Seq(Libraries.configuration, Libraries.scalaLang, Libraries.squants)) settings (coreSettings: _*) dependsOn(openmoleNetwork, openmoleCrypto, openmoleFile, openmoleThread, openmoleTypes, openmoleLock, exception)
libraryDependencies ++= Seq(Libraries.configuration, Libraries.squants), Libraries.addScalaLang) settings (coreSettings: _*) dependsOn(openmoleNetwork, openmoleCrypto, openmoleFile, openmoleThread, openmoleTypes, openmoleLock, exception)
lazy val workspace = OsgiProject(coreDir, "org.openmole.core.workspace", imports = Seq("*")) dependsOn
(exception, event, tools, openmoleCrypto) settings (coreSettings: _*)
......@@ -218,7 +219,7 @@ lazy val output = OsgiProject(coreDir, "org.openmole.core.output", imports = Seq
lazy val console = OsgiProject(coreDir, "org.openmole.core.console", global = true, imports = Seq("*")) dependsOn
(pluginManager) settings(
OsgiKeys.importPackage := Seq("*"),
libraryDependencies += Libraries.scalaLang,
Libraries.addScalaLang,
libraryDependencies += Libraries.monocle,
macroParadise,
defaultActivator
......@@ -352,7 +353,8 @@ lazy val desktopgrid = OsgiProject(pluginDir, "org.openmole.plugin.environment.d
lazy val egi = OsgiProject(pluginDir, "org.openmole.plugin.environment.egi", imports = Seq("!org.apache.http.*", "!fr.iscpif.gridscale.libraries.srmstub", "!fr.iscpif.gridscale.libraries.lbstub", "!fr.iscpif.gridscale.libraries.wmsstub", "!com.google.common.cache", "*")) dependsOn(openmoleDSL,
batch,
workspace, fileService, gridscale) settings (
libraryDependencies ++= Seq(Libraries.gridscaleGlite, Libraries.gridscaleHTTP, Libraries.scalaLang)
libraryDependencies ++= Seq(Libraries.gridscaleGlite, Libraries.gridscaleHTTP),
Libraries.addScalaLang
) settings (pluginSettings: _*)
lazy val gridscale = OsgiProject(pluginDir, "org.openmole.plugin.environment.gridscale", imports = Seq("*")) dependsOn(openmoleDSL, tools,
......@@ -485,7 +487,7 @@ lazy val server = OsgiProject(
"org.openmole.rest.server",
imports = Seq("org.h2", "!com.sun.*", "*")
) dependsOn(workflow, openmoleTar, openmoleCollection, project, message, openmoleCrypto, services) settings (
libraryDependencies ++= Seq(Libraries.bouncyCastle, Libraries.logback, Libraries.scalatra, Libraries.scalaLang, Libraries.arm, Libraries.codec, Libraries.json4s)) settings (defaultSettings: _*)
libraryDependencies ++= Seq(Libraries.bouncyCastle, Libraries.logback, Libraries.scalatra, Libraries.arm, Libraries.codec, Libraries.json4s), Libraries.addScalaLang) settings (defaultSettings: _*)
lazy val client = Project("org-openmole-rest-client", restDir / "client") settings(
libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.3.5",
......@@ -768,10 +770,10 @@ lazy val daemon = OsgiProject(binDir, "org.openmole.daemon") enablePlugins (TarP
Libraries.gridscale,
Libraries.gridscaleSSH,
Libraries.bouncyCastle,
Libraries.scalaLang,
Libraries.logging,
Libraries.scopt
),
Libraries.addScalaLang,
defaultActivator,
assemblyDependenciesPath := assemblyPath.value / "plugins",
dependencyFilter := bundleFilter,
......
......@@ -42,6 +42,8 @@ object Libraries {
/** ------- Bundles -------------- */
lazy val addScalaLang = libraryDependencies += "org.openmole.library" %% "org-scala-lang-scala-library" % scalaVersion.value
lazy val scalatra = "org.openmole.library" %% "org-scalatra" % "2.5.0"
lazy val logback = "org.openmole.library" %% "ch-qos-logback" % "1.0.9"
lazy val h2 = "org.openmole.library" %% "org-h2" % "1.4.195"
......@@ -49,7 +51,6 @@ object Libraries {
lazy val slick = "org.openmole.library" %% "com-typesafe-slick" % "3.2.0"
lazy val slf4j = "org.openmole.library" %% "org-slf4j" % "1.7.10"
lazy val xstream = "org.openmole.library" %% "com-thoughtworks-xstream" % "1.4.9"
lazy val scalaLang = "org.openmole.library" %% "org-scala-lang-scala-library" % "2.12.2"
lazy val jasypt = "org.openmole.library" %% "org-jasypt-encryption" % "1.9.2"
lazy val opencsv = "org.openmole.library" %% "au-com-bytecode-opencsv" % "2.3"
lazy val arm = "org.openmole.library" %% "com-jsuereth-scala-arm" % "2.0"
......
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