Skip to content

[ETCM-129] step 1 - update libraries #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ val commonSettings = Seq(
val malletDeps = Seq(
Dependencies.scopt
).flatten ++ Seq(
"org.jline" % "jline" % "3.1.2",
"net.java.dev.jna" % "jna" % "4.5.1"
Dependencies.jline,
Dependencies.jna
)

val dep = {
Expand Down
36 changes: 20 additions & 16 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object Dependencies {
)
}

val boopickle = Seq("io.suzaku" %% "boopickle" % "1.3.0")
val boopickle = Seq("io.suzaku" %% "boopickle" % "1.3.3")

val rocksDb = Seq(
"org.rocksdb" % "rocksdbjni" % "6.11.4"
Expand All @@ -54,7 +54,7 @@ object Dependencies {
"org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
"org.scalamock" %% "scalamock" % "5.0.0" % "test",
"org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
"org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
"org.scalacheck" %% "scalacheck" % "1.14.3" % "it,test"
)

val cats: Seq[ModuleID] = {
Expand All @@ -72,33 +72,37 @@ object Dependencies {

val logging = Seq(
"ch.qos.logback" % "logback-classic" % "1.2.3",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
"net.logstash.logback" % "logstash-logback-encoder" % "6.4",
"org.codehaus.janino" % "janino" % "3.0.6"
"org.codehaus.janino" % "janino" % "3.1.2"
)

val twitterUtilCollection = Seq("com.twitter" %% "util-collection" % "18.5.0")
val twitterUtilCollection = Seq("com.twitter" %% "util-collection" % "19.1.0")

val crypto = Seq("org.bouncycastle" % "bcprov-jdk15on" % "1.59")
val crypto = Seq("org.bouncycastle" % "bcprov-jdk15on" % "1.66")

val scopt = Seq("com.github.scopt" % "scopt_2.12" % "3.7.0")
val scopt = Seq("com.github.scopt" % "scopt_2.12" % "3.7.1")

val apacheCommons = Seq(
"commons-io" % "commons-io" % "2.6"
"commons-io" % "commons-io" % "2.8.0"
)

val jline = "org.jline" % "jline" % "3.16.0"

val jna = "net.java.dev.jna" % "jna" % "5.6.0"

val dependencies = Seq(
"org.jline" % "jline" % "3.1.2",
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0",
"org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0",
"com.google.guava" % "guava" % "28.0-jre",
"org.xerial.snappy" % "snappy-java" % "1.1.7.2",
"org.web3j" % "core" % "3.4.0" % "test"
jline,
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2",
"org.scala-sbt.ipcsocket" % "ipcsocket" % "1.1.0",
"com.google.guava" % "guava" % "29.0-jre",
"org.xerial.snappy" % "snappy-java" % "1.1.7.7",
"org.web3j" % "core" % "5.0.0" % Test
)

val prometheus: Seq[ModuleID] = {
val provider = "io.prometheus"
val version = "0.8.0"
val version = "0.9.0"
Seq(
provider % "simpleclient" % version,
provider % "simpleclient_logback" % version,
Expand All @@ -109,7 +113,7 @@ object Dependencies {

val micrometer: Seq[ModuleID] = {
val provider = "io.micrometer"
val version = "1.0.4"
val version = "1.5.5"
Seq(
// Required to compile metrics library https://github.com/micrometer-metrics/micrometer/issues/1133#issuecomment-452434205
"com.google.code.findbugs" % "jsr305" % "3.0.2" % Optional,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.2.8
sbt.version = 1.3.13
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
logLevel := sbt.Level.Warn
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")

libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"
Loading