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

[Lib] enh: update libraries

parent 25f4d946
Pipeline #1210 failed with stages
in 9 minutes and 9 seconds
...@@ -12,7 +12,7 @@ def settings = Seq( ...@@ -12,7 +12,7 @@ def settings = Seq(
resolvers += Resolver.sonatypeRepo("staging"), resolvers += Resolver.sonatypeRepo("staging"),
resolvers += "netlogo" at "https://dl.cloudsmith.io/public/netlogo/netlogo/maven/", // netlogo 6.2 resolvers += "netlogo" at "https://dl.cloudsmith.io/public/netlogo/netlogo/maven/", // netlogo 6.2
Global / scalaVersion := scalaVersionValue, Global / scalaVersion := scalaVersionValue,
scalacOptions ++= Seq("-deprecation"), scalacOptions ++= Seq("-deprecation", "-Ytasty-reader"),
publishLocal / packageDoc / publishArtifact := false, publishLocal / packageDoc / publishArtifact := false,
publishLocal / packageSrc / publishArtifact := false, publishLocal / packageSrc / publishArtifact := false,
organization := "org.openmole.library", organization := "org.openmole.library",
...@@ -22,7 +22,7 @@ def settings = Seq( ...@@ -22,7 +22,7 @@ def settings = Seq(
lazy val scalatra = OsgiProject(dir, "org.scalatra", lazy val scalatra = OsgiProject(dir, "org.scalatra",
exports = Seq("org.scalatra.*, org.fusesource.*", "grizzled.*", "org.eclipse.jetty.*", "javax.*"), exports = Seq("org.scalatra.*, org.fusesource.*", "grizzled.*", "org.eclipse.jetty.*", "javax.*"),
privatePackages = Seq("!scala.*", "!org.slf4j.*", "**"), privatePackages = Seq("scala.xml.*", "!scala.*", "!org.slf4j.*", "**"),
imports = Seq("scala.*", "org.slf4j.*"), imports = Seq("scala.*", "org.slf4j.*"),
global = true) settings( global = true) settings(
libraryDependencies += "org.scalatra" %% "scalatra" % scalatraVersion, libraryDependencies += "org.scalatra" %% "scalatra" % scalatraVersion,
...@@ -103,8 +103,8 @@ lazy val scalaLang = OsgiProject( ...@@ -103,8 +103,8 @@ lazy val scalaLang = OsgiProject(
privatePackages = Seq("*", "META-INF.native.**"), imports = Seq("!org.apache.sshd.*", "!org.mozilla.*", "!org.apache.tools.ant.*", "!sun.misc.*", "!javax.annotation.*", "*")) settings privatePackages = Seq("*", "META-INF.native.**"), imports = Seq("!org.apache.sshd.*", "!org.mozilla.*", "!org.apache.tools.ant.*", "!sun.misc.*", "!javax.annotation.*", "*")) settings
(libraryDependencies ++= { (libraryDependencies ++= {
Seq( Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.2.0", //"org.scala-lang.modules" %% "scala-xml" % "2.0.0",
"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.6", //"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.6",
"org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0", "org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0",
"org.scala-lang" % "scala-library" % scalaVersion.value, "org.scala-lang" % "scala-library" % scalaVersion.value,
"org.scala-lang" % "scala-reflect" % scalaVersion.value, "org.scala-lang" % "scala-reflect" % scalaVersion.value,
...@@ -117,6 +117,16 @@ lazy val scalaLang = OsgiProject( ...@@ -117,6 +117,16 @@ lazy val scalaLang = OsgiProject(
) )
}, version := scalaVersion.value) settings(settings: _*) }, version := scalaVersion.value) settings(settings: _*)
lazy val scalaXML = OsgiProject(
dir,
"org.scala-lang.modules.xml",
exports = Seq("scala.xml.*"),
privatePackages = Seq("scala.xml.*", "!scala.*", "*")
) settings(
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % scalaXMLVersion,
version := scalaXMLVersion
) settings(settings: _*)
lazy val jasypt = OsgiProject(dir, "org.jasypt.encryption", exports = Seq("org.jasypt.*")) settings( lazy val jasypt = OsgiProject(dir, "org.jasypt.encryption", exports = Seq("org.jasypt.*")) settings(
libraryDependencies += "org.jasypt" % "jasypt" % jasyptVersion, libraryDependencies += "org.jasypt" % "jasypt" % jasyptVersion,
version := jasyptVersion version := jasyptVersion
...@@ -217,15 +227,25 @@ lazy val squants = ...@@ -217,15 +227,25 @@ lazy val squants =
) settings(settings: _*) ) settings(settings: _*)
lazy val mgo = OsgiProject(dir, "mgo", exports = Seq("mgo.*", "freestyle.*"), imports = Seq("!better.*", "!javax.xml.*", "!scala.meta.*", "!sun.misc.*", "*"), privatePackages = Seq("!scala.*", "!monocle.*", "!org.apache.commons.math3.*", "!cats.*", "!squants.*", "!scalaz.*", "*")) settings( lazy val mgo = OsgiProject(
dir,
"mgo",
exports = Seq("mgo.*"),
imports = Seq("scala.*", "monocle.*", "cats.*", "squants.*", "!com.oracle.svm.*", "!*"), //Seq("!better.*", "!javax.xml.*", "!scala.meta.*", "!sun.misc.*", "*"),
privatePackages = Seq("!scala.*", "!monocle.*", "!squants.*", "!cats.*", "*") /*Seq("!scala.*", "!monocle.*", "!org.apache.commons.math3.*", "!cats.*", "!squants.*", "!scalaz.*", "*")*/) settings(
libraryDependencies += "org.openmole" %% "mgo" % mgoVersion, libraryDependencies += "org.openmole" %% "mgo" % mgoVersion,
version := mgoVersion) dependsOn(monocle, math, cats, squants) settings(settings: _*) version := mgoVersion) dependsOn(monocle, cats, squants) settings(settings: _*)
lazy val container = OsgiProject(dir, "container", exports = Seq("container.*"), imports = Seq("!better.*", "!javax.xml.*", "!scala.meta.*", "!sun.misc.*", "!com.github.luben.*", "!org.apache.avalon.*", "!org.apache.log.*", "!org.brotli.dec.*", "!javax.*","*"), privatePackages = Seq("!scala.*", "!monocle.*", "!org.apache.commons.math3.*", "!cats.*", "!squants.*", "!scalaz.*", "!io.circe.*", "!shapeless.*", "*")) settings( lazy val container = OsgiProject(
dir,
"container",
exports = Seq("container.*"),
imports = Seq("scala.*", "squants.*", "monocle.*", "cats.*", "!com.oracle.svm.*", "!org.graalvm.*", "!*"),
privatePackages = Seq("!scala.*", "!monocle.*", "!squants.*", "*")) settings(
libraryDependencies += "org.openmole" %% "container" % containerVersion, libraryDependencies += "org.openmole" %% "container" % containerVersion,
//libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.3-1", //libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.3-1",
version := containerVersion) dependsOn(cats, squants, circe, shapeless) settings(settings: _*) version := containerVersion) dependsOn(cats, squants) settings(settings: _*)
lazy val spatialdata = OsgiProject(dir, "org.openmole.spatialsampling", lazy val spatialdata = OsgiProject(dir, "org.openmole.spatialsampling",
exports = Seq("org.openmole.spatialsampling.*"), exports = Seq("org.openmole.spatialsampling.*"),
......
...@@ -30,9 +30,10 @@ def defaultSettings = formatSettings ++ ...@@ -30,9 +30,10 @@ def defaultSettings = formatSettings ++
Seq( Seq(
organization := "org.openmole", organization := "org.openmole",
updateOptions := updateOptions.value.withCachedResolution(true), updateOptions := updateOptions.value.withCachedResolution(true),
resolvers += DefaultMavenRepository,
resolvers += Resolver.sonatypeRepo("releases"),
resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("snapshots"),
resolvers += Resolver.sonatypeRepo("staging"), resolvers += Resolver.sonatypeRepo("staging"),
resolvers += Resolver.bintrayRepo("projectseptemberinc", "maven"), // For freek
resolvers += Resolver.bintrayRepo("definitelyscala", "maven"), // For plotlyjs resolvers += Resolver.bintrayRepo("definitelyscala", "maven"), // For plotlyjs
Global / scalaVersion := scalaVersionValue, // + "-bin-typelevel-4", Global / scalaVersion := scalaVersionValue, // + "-bin-typelevel-4",
scalacOptions ++= Seq("-target:11", "-language:higherKinds"), scalacOptions ++= Seq("-target:11", "-language:higherKinds"),
...@@ -41,7 +42,7 @@ def defaultSettings = formatSettings ++ ...@@ -41,7 +42,7 @@ def defaultSettings = formatSettings ++
javacOptions ++= Seq("-source", "11", "-target", "11"), javacOptions ++= Seq("-source", "11", "-target", "11"),
install / packageDoc / publishArtifact := false, install / packageDoc / publishArtifact := false,
install / packageSrc / publishArtifact := false, install / packageSrc / publishArtifact := false,
scalacOptions ++= Seq("-Ymacro-annotations", "-language:postfixOps", "-Ydelambdafy:inline"), scalacOptions ++= Seq("-Ymacro-annotations", "-language:postfixOps", "-Ytasty-reader", "-Ydelambdafy:inline"),
//scalaOrganization := "org.typelevel", //scalaOrganization := "org.typelevel",
//scalaVersion := "2.12.4-bin-typelevel-4", //scalaVersion := "2.12.4-bin-typelevel-4",
//addCompilerPlugin("org.scalameta" % "paradise" % "3.0.0-M10" cross CrossVersion.full), //addCompilerPlugin("org.scalameta" % "paradise" % "3.0.0-M10" cross CrossVersion.full),
...@@ -554,7 +555,9 @@ lazy val python = OsgiProject(pluginDir, "org.openmole.plugin.task.python", impo ...@@ -554,7 +555,9 @@ lazy val python = OsgiProject(pluginDir, "org.openmole.plugin.task.python", impo
lazy val julia = OsgiProject(pluginDir, "org.openmole.plugin.task.julia", imports = Seq("*")) dependsOn(container, json) settings (pluginSettings: _*) lazy val julia = OsgiProject(pluginDir, "org.openmole.plugin.task.julia", imports = Seq("*")) dependsOn(container, json) settings (pluginSettings: _*)
lazy val gama = OsgiProject(pluginDir, "org.openmole.plugin.task.gama", imports = Seq("*")) dependsOn (container) settings (pluginSettings: _*) lazy val gama = OsgiProject(pluginDir, "org.openmole.plugin.task.gama", imports = Seq("*")) dependsOn (container) settings (pluginSettings: _*) settings (
libraryDependencies += Libraries.scalaXML
)
lazy val cormas = OsgiProject(pluginDir, "org.openmole.plugin.task.cormas", imports = Seq("*")) dependsOn (container, json) settings (pluginSettings: _*) settings( lazy val cormas = OsgiProject(pluginDir, "org.openmole.plugin.task.cormas", imports = Seq("*")) dependsOn (container, json) settings (pluginSettings: _*) settings(
libraryDependencies += Libraries.json4s) libraryDependencies += Libraries.json4s)
......
...@@ -37,7 +37,8 @@ object Libraries { ...@@ -37,7 +37,8 @@ object Libraries {
"org.scalameta" %% "scalameta" % "4.3.15" "org.scalameta" %% "scalameta" % "4.3.15"
) )
lazy val scalatra = "org.openmole.library" %% "org-scalatra" % scalatraVersion lazy val scalaXML = "org.openmole.library" %% "org-scala-lang-modules-xml" % scalaXMLVersion
lazy val scalatra = "org.openmole.library" %% "org-scalatra" % scalatraVersion exclude("org.scala-lang.modules", "scala-xml_2.13")
lazy val logback = "org.openmole.library" %% "ch-qos-logback" % logbackVersion lazy val logback = "org.openmole.library" %% "ch-qos-logback" % logbackVersion
lazy val h2 = "org.openmole.library" %% "org-h2" % h2Version lazy val h2 = "org.openmole.library" %% "org-h2" % h2Version
lazy val bonecp = "org.openmole.library" %% "com-jolbox-bonecp" % "0.8.0.RELEASE" lazy val bonecp = "org.openmole.library" %% "com-jolbox-bonecp" % "0.8.0.RELEASE"
......
...@@ -4,10 +4,11 @@ package openmole ...@@ -4,10 +4,11 @@ package openmole
object common { object common {
def scalaVersionValue = "2.13.6" def scalaVersionValue = "2.13.6"
def gridscaleVersion = "2.37" def scalaXMLVersion = "2.0.0"
def gridscaleVersion = "2.38"
def mgoVersion = "3.50" def mgoVersion = "3.50"
def sshjVersion = "0.31.0" def sshjVersion = "0.31.0"
def containerVersion = "1.16" def containerVersion = "1.17"
def bouncyCastleVersion = "1.68" def bouncyCastleVersion = "1.68"
def netLogo5Version = "5.3.1" def netLogo5Version = "5.3.1"
def netLogo6Version = "6.2.0" def netLogo6Version = "6.2.0"
...@@ -18,10 +19,10 @@ object common { ...@@ -18,10 +19,10 @@ object common {
def sourcecodeVersion = "0.2.1" def sourcecodeVersion = "0.2.1"
def scaladgetVersion = "1.3.7" def scaladgetVersion = "1.3.7"
def sortableVersion = "0.7.2" def sortableVersion = "0.7.2"
def json4sVersion = "3.6.7" def json4sVersion = "4.0.1"
def circeVersion = "0.13.0" def circeVersion = "0.13.0"
def catsVersion = "2.1.0" def catsVersion = "2.1.0"
def squantsVersion = "1.6.0" def squantsVersion = "1.8.0"
def xstreamVersion = "1.4.16" def xstreamVersion = "1.4.16"
def scalaURIVersion = "1.1.1" def scalaURIVersion = "1.1.1"
def scoptVersion = "3.7.1" def scoptVersion = "3.7.1"
...@@ -31,7 +32,7 @@ object common { ...@@ -31,7 +32,7 @@ object common {
def shapelessVersion = "2.3.3" def shapelessVersion = "2.3.3"
def slickVersion = "3.3.2" def slickVersion = "3.3.2"
def jasyptVersion = "1.9.3" def jasyptVersion = "1.9.3"
def monocleVersion = "3.0.0-RC2" def monocleVersion = "3.0.0"
def scalazVersion = "7.2.30" def scalazVersion = "7.2.30"
def mathVersion = "3.6.1" def mathVersion = "3.6.1"
def asmVersion = "7.2" def asmVersion = "7.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