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

[Lib] enh: more updates in preparation for 2.13

parent bcaf539c
Pipeline #439 failed with stage
in 4 minutes and 31 seconds
......@@ -36,8 +36,8 @@ lazy val json4s = OsgiProject(dir, "org.json4s",
exports = Seq("org.json4s.*"),
privatePackages = Seq("!scala.*", "!org.slf4j.*", "!com.thoughtworks.paranamer.*", "*"),
imports = Seq("scala.*", "org.slf4j.*", "com.thoughtworks.paranamer.*", "")) settings (
libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.5.0",
version := "3.5.0") settings(settings: _*)
libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.7",
version := "3.6.7") settings(settings: _*)
lazy val shapelessVersion = "2.3.3"
lazy val shapeless = OsgiProject(dir, "com.chuusai.shapeless", exports = Seq("shapeless.*")) settings (
......@@ -58,7 +58,7 @@ lazy val circe = OsgiProject(dir, "io.circe",
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: _*)
(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3", version := "1.2.3") settings(settings: _*)
lazy val h2Version = "1.4.199"
lazy val h2 = OsgiProject(dir, "org.h2", dynamicImports = Seq("*"), privatePackages = Seq("META-INF.*")) settings
......@@ -72,8 +72,8 @@ lazy val slick = OsgiProject(dir,"com.typesafe.slick", exports = Seq("slick.*"),
(libraryDependencies += "com.typesafe.slick" %% "slick" % slickVersion, version := slickVersion) settings(settings: _*)
lazy val slf4j = OsgiProject(dir,"org.slf4j") settings(
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.10",
version := "1.7.10") settings(settings: _*)
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.30",
version := "1.7.30") settings(settings: _*)
lazy val xstream = OsgiProject(
dir,
......@@ -112,9 +112,9 @@ lazy val scalaLang = OsgiProject(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scala-lang" % "scalap" % scalaVersion.value,
"jline" % "jline" % "2.12.1",
"org.scala-stm" %% "scala-stm" % "0.8",
"org.scala-stm" %% "scala-stm" % "0.9.1",
"com.typesafe" % "config" % "1.2.1",
"org.scalameta" %% "scalameta" % "4.1.0",
"org.scalameta" %% "scalameta" % "4.3.0",
"org.scala-lang" % "scala-compiler" % scalaVersion.value
)
}, version := scalaVersion.value) settings(settings: _*)
......@@ -162,7 +162,7 @@ lazy val netlogo6 = OsgiProject(
"net.lingala.zip4j" % "zip4j" % "1.3.2" % "provided"
), version := netLogo6Version, scalaVersion := "2.12.8", crossPaths := false) settings(settings: _*)
lazy val scalaTagsVersion = "0.6.5"
lazy val scalaTagsVersion = "0.8.3"
lazy val scalaRxVersion = "0.4.0"
lazy val scalaDomVersion = "0.9.3"
lazy val scalaUpickleVersion = "0.4.4"
......@@ -182,7 +182,7 @@ lazy val scalaJS = OsgiProject(dir, "scalajs", exports = Seq("scala.scalajs.*"),
version := scalajsVersion
) settings(settings: _*)
lazy val scalaTags = OsgiProject(dir, "com.scalatags", exports = Seq("scalatags.*")) settings(
lazy val scalaTags = OsgiProject(dir, "com.scalatags", exports = Seq("scalatags.*"), privatePackages = Seq("geny.*")) settings(
libraryDependencies ++= Seq("com.lihaoyi" %% "scalatags" % scalaTagsVersion),
version := scalaTagsVersion) settings(settings: _*)
......@@ -303,19 +303,19 @@ lazy val codec = OsgiProject(dir, "org.apache.commons.codec") settings
(libraryDependencies += "commons-codec" % "commons-codec" % "1.13", version := "1.13") settings(settings: _*)
lazy val collections = OsgiProject(dir, "org.apache.commons.collections", exports = Seq("org.apache.commons.collections4.*")) settings
(libraryDependencies += "org.apache.commons" % "commons-collections4" % "4.1", version := "4.1") settings(settings: _*)
(libraryDependencies += "org.apache.commons" % "commons-collections4" % "4.4", version := "4.4") settings(settings: _*)
lazy val jgit = OsgiProject(dir, "org.eclipse.jgit", privatePackages = Seq("!scala.*", "!org.slf4j.*", "*")) settings (
libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r", version := "4.11" ) settings(settings: _*)
libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.6.0.201912101111-r", version := "4.6.0" ) settings(settings: _*)
lazy val txtmark = OsgiProject(dir, "com.github.rjeschke.txtmark", privatePackages = Seq("!scala.*", "!org.slf4j.*", "*")) settings (
libraryDependencies += "com.github.rjeschke" % "txtmark" % "0.13", version := "0.13" ) settings(settings: _*)
lazy val clapperVersion = "1.1.2"
lazy val clapperVersion = "1.5.1"
lazy val clapper = OsgiProject(dir, "org.clapper", exports = Seq("!scala.*","!grizzled.*","!jline.*","!org.fusesource.*","!org.slf4j.*","*")) settings (
libraryDependencies += "org.clapper" %% "classutil" % clapperVersion, version := clapperVersion) settings(settings: _*)
val scalazVersion = "7.2.9"
val scalazVersion = "7.2.30"
lazy val scalaz = OsgiProject(dir, "org.scalaz", exports = Seq("!scala.*","*")) settings (
libraryDependencies += "org.scalaz" %% "scalaz-core" % scalazVersion, version := scalazVersion) settings(settings: _*)
......@@ -330,7 +330,7 @@ lazy val monocle = OsgiProject(dir, "monocle",
).map(_ % monocleVersion),
version := monocleVersion) settings(settings: _*) dependsOn(shapeless, scalaz, cats)
val asmVersion = "5.1"
val asmVersion = "7.2"
lazy val asm = OsgiProject(dir, "org.objectweb.asm") settings (
libraryDependencies += "org.ow2.asm" % "asm" % asmVersion,
......
......@@ -21,7 +21,7 @@ import java.io.{ ByteArrayOutputStream, IOException }
import ch.qos.logback.classic.encoder.PatternLayoutEncoder
import ch.qos.logback.classic.spi.ILoggingEvent
import ch.qos.logback.core.AppenderBase
import ch.qos.logback.core.{ AppenderBase, OutputStreamAppender }
import org.openmole.tool.logger.JavaLogger
class OpenMOLEAppender extends AppenderBase[ILoggingEvent] with JavaLogger {
......@@ -32,7 +32,9 @@ class OpenMOLEAppender extends AppenderBase[ILoggingEvent] with JavaLogger {
override def start {
if (encoder != null) {
try {
encoder.init(byteOutputStream)
val app = new OutputStreamAppender
app.setOutputStream(byteOutputStream)
encoder.setParent(app)
}
catch {
case e: IOException
......@@ -44,7 +46,7 @@ class OpenMOLEAppender extends AppenderBase[ILoggingEvent] with JavaLogger {
def append(event: ILoggingEvent) {
try {
encoder.doEncode(event)
encoder.encode(event)
Log.logger.fine(byteOutputStream.toString)
byteOutputStream.reset
}
......
......@@ -15,7 +15,7 @@ object Libraries {
lazy val tooltipserVersion = "3.3.0"
lazy val netLogo5Version = "5.3.1"
lazy val netLogo6Version = "6.1.1"
lazy val scalaTagsVersion = "0.6.5"
lazy val scalaTagsVersion = "0.8.3"
lazy val scalaJSDomVersion = "0.9.3"
lazy val rxVersion = "0.4.0"
lazy val boopickleVersion = "1.3.1"
......@@ -62,11 +62,11 @@ object Libraries {
)
lazy val scalatra = "org.openmole.library" %% "org-scalatra" % scalatraVersion
lazy val logback = "org.openmole.library" %% "ch-qos-logback" % "1.0.9"
lazy val logback = "org.openmole.library" %% "ch-qos-logback" % "1.2.3"
lazy val h2 = "org.openmole.library" %% "org-h2" % "1.4.199"
lazy val bonecp = "org.openmole.library" %% "com-jolbox-bonecp" % "0.8.0.RELEASE"
lazy val slick = "org.openmole.library" %% "com-typesafe-slick" % "3.3.0"
lazy val slf4j = "org.openmole.library" %% "org-slf4j" % "1.7.10"
lazy val slf4j = "org.openmole.library" %% "org-slf4j" % "1.7.30"
lazy val xstream = "org.openmole.library" %% "com-thoughtworks-xstream" % xstreamVersion
lazy val jasypt = "org.openmole.library" %% "org-jasypt-encryption" % "1.9.2"
lazy val opencsv = "org.openmole.library" %% "au-com-bytecode-opencsv" % "2.3"
......@@ -76,7 +76,7 @@ object Libraries {
lazy val scalabc = "org.openmole.library" %% "fr-iscpif-scalabc" % "0.4"
lazy val scalatexSite = "org.openmole.library" %% "com-lihaoyi-scalatex-site" % "0.3.12"
lazy val math = "org.openmole.library" %% "org-apache-commons-math" % "3.6.1"
lazy val collections = "org.openmole.library" %% "org-apache-commons-collections" % "4.1"
lazy val collections = "org.openmole.library" %% "org-apache-commons-collections" % "4.4"
lazy val exec = "org.openmole.library" %% "org-apache-commons-exec" % "1.3"
lazy val log4j = "org.openmole.library" %% "org-apache-log4j" % "1.2.17"
lazy val logging = "org.openmole.library" %% "org-apache-commons-logging" % "1.2"
......@@ -84,11 +84,11 @@ object Libraries {
lazy val ant = "org.openmole.library" %% "org-apache-ant" % "1.8.0"
lazy val codec = "org.openmole.library" %% "org-apache-commons-codec" % "1.13"
lazy val async = "org.openmole.library" %% "scala-async" % "0.10.0"
lazy val jgit = "org.openmole.library" %% "org-eclipse-jgit" % "4.11"
lazy val jgit = "org.openmole.library" %% "org-eclipse-jgit" % "5.6.0"
lazy val cats = "org.openmole.library" %% "cats" % catsVersion
lazy val squants = "org.openmole.library" %% "squants" % squantsVersion
lazy val clapper = "org.openmole.library" %% "org-clapper" % "1.1.2"
lazy val asm = "org.openmole.library" %% "org-objectweb-asm" % "5.1"
lazy val clapper = "org.openmole.library" %% "org-clapper" % "1.5.1"
lazy val asm = "org.openmole.library" %% "org-objectweb-asm" % "7.2"
lazy val configuration = "org.openmole.library" %% "org-apache-commons-configuration2" % "2.2"
lazy val json4s = "org.openmole.library" %% "org-json4s" % json4sVersion
lazy val circe = "org.openmole.library" %% "io-circe" % circeVersion
......@@ -139,7 +139,7 @@ object Libraries {
lazy val gridscaleLocal = "org.openmole.library" %% "gridscale-local" % gridscaleVersion
lazy val gridscaleOAR = "org.openmole.library" %% "gridscale-oar" % gridscaleVersion
lazy val scalaz = "org.scalaz" %% "scalaz-core" % "7.2.28"
lazy val scalaz = "org.scalaz" %% "scalaz-core" % "7.2.30"
lazy val guava = "com.google.guava" % "guava" % "27.1-jre"
lazy val spray = "io.spray" %% "spray-json" % "1.3.2"
lazy val bouncyCastle = "org.bouncycastle" % "bcpkix-jdk15on" % bouncyCastleVersion
......
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