Skip to content

Commit

Permalink
Bumped dependencies (wavesplatform#3933)
Browse files Browse the repository at this point in the history
  • Loading branch information
phearnot authored Jan 16, 2024
1 parent f3cb220 commit b9d603b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ checkPRRaw := Def
(`repl-jvm` / Test / test).value
(`lang-js` / Compile / fastOptJS).value
(`lang-tests-js` / Test / test).value
(`grpc-server` / Test / test).value
// (`grpc-server` / Test / test).value
(node / Test / test).value
(`repl-js` / Compile / fastOptJS).value
(`node-it` / Test / compile).value
Expand Down
3 changes: 2 additions & 1 deletion node/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ inTask(assembly)(
case p
if p.endsWith(".proto") ||
p.endsWith("module-info.class") ||
p.endsWith("io.netty.versions.properties") =>
p.endsWith("io.netty.versions.properties") ||
p.endsWith(".kotlin_module") =>
MergeStrategy.discard

case "scala-collection-compat.properties" =>
Expand Down
27 changes: 13 additions & 14 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import scalapb.compiler.Version.scalapbVersion
object Dependencies {
// Node protobuf schemas
private[this] val protoSchemasLib =
"com.wavesplatform" % "protobuf-schemas" % "1.5.2-86-SNAPSHOT" classifier "protobuf-src" intransitive ()
"com.wavesplatform" % "protobuf-schemas" % "1.5.2" classifier "protobuf-src" intransitive ()

private def akkaModule(module: String) = "com.typesafe.akka" %% s"akka-$module" % "2.6.21"

Expand All @@ -20,17 +20,19 @@ object Dependencies {

def monixModule(module: String): Def.Initialize[ModuleID] = Def.setting("io.monix" %%% s"monix-$module" % "3.4.1")

private def grpcModule(module: String) = "io.grpc" % module % "1.61.0"

val kindProjector = compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)

val akkaHttp = akkaHttpModule("akka-http")
val googleGuava = "com.google.guava" % "guava" % "32.1.3-jre"
val googleGuava = "com.google.guava" % "guava" % "33.0.0-jre"
val kamonCore = kamonModule("core")
val machinist = "org.typelevel" %% "machinist" % "0.6.8"
val logback = "ch.qos.logback" % "logback-classic" % "1.4.14"
val janino = "org.codehaus.janino" % "janino" % "3.1.11"
val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "2.12.3"
val curve25519 = "com.wavesplatform" % "curve25519-java" % "0.6.6"
val nettyHandler = "io.netty" % "netty-handler" % "4.1.101.Final"
val nettyHandler = "io.netty" % "netty-handler" % "4.1.104.Final"

val shapeless = Def.setting("com.chuusai" %%% "shapeless" % "2.3.10")

Expand Down Expand Up @@ -75,7 +77,7 @@ object Dependencies {
logback,
"com.github.jnr" % "jnr-unixsocket" % "0.38.21", // To support Apple ARM
"com.spotify" % "docker-client" % "8.16.0",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-properties" % "2.16.0",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-properties" % "2.16.1",
asyncHttpClient
).map(_ % Test)

Expand All @@ -89,7 +91,7 @@ object Dependencies {

lazy val qaseReportDeps = Seq(
playJson,
("io.qase" % "qase-api" % "3.1.1").excludeAll(ExclusionRule(organization = "javax.ws.rs"))
("io.qase" % "qase-api" % "3.2.0").excludeAll(ExclusionRule(organization = "javax.ws.rs"))
).map(_ % Test)

lazy val logDeps = Seq(
Expand All @@ -100,8 +102,6 @@ object Dependencies {

private val rocksdb = "org.rocksdb" % "rocksdbjni" % "8.9.1"

private val scalapbJson = "com.thesamet.scalapb" %% "scalapb-json4s" % "0.12.1"

lazy val node = Def.setting(
Seq(
rocksdb,
Expand All @@ -115,7 +115,7 @@ object Dependencies {
kamonModule("influxdb"),
kamonModule("akka-http"),
kamonModule("executors"),
"org.influxdb" % "influxdb-java" % "2.23",
"org.influxdb" % "influxdb-java" % "2.24",
googleGuava,
"com.google.code.findbugs" % "jsr305" % "3.0.2" % Compile, // javax.annotation stubs
playJson,
Expand All @@ -128,15 +128,15 @@ object Dependencies {
nettyHandler,
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"eu.timepit" %% "refined" % "0.11.0" exclude ("org.scala-lang.modules", "scala-xml_2.13"),
"com.esaulpaugh" % "headlong" % "10.0.1",
"com.esaulpaugh" % "headlong" % "10.0.2",
"com.github.jbellis" % "jamm" % "0.4.0", // Weighing caches
web3jModule("abi"),
akkaModule("testkit") % Test,
akkaHttpModule("akka-http-testkit") % Test
) ++ test ++ console ++ logDeps ++ protobuf.value ++ langCompilerPlugins.value
)

val gProto = "com.google.protobuf" % "protobuf-java" % "3.25.1"
val gProto = "com.google.protobuf" % "protobuf-java" % "3.25.2"

lazy val scalapbRuntime = Def.setting(
Seq(
Expand All @@ -152,16 +152,15 @@ object Dependencies {
}

lazy val grpc: Seq[ModuleID] = Seq(
"io.grpc" % "grpc-netty" % scalapb.compiler.Version.grpcJavaVersion,
"io.grpc" % "grpc-services" % scalapb.compiler.Version.grpcJavaVersion,
grpcModule("grpc-netty"),
grpcModule("grpc-services"),
"com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapbVersion,
protoSchemasLib % "protobuf"
)

lazy val rideRunner = Def.setting(
Seq(
rocksdb,
scalapbJson,
// https://github.com/netty/netty/wiki/Native-transports
// "io.netty" % "netty-transport-native-epoll" % "4.1.79.Final" classifier "linux-x86_64",
"com.github.ben-manes.caffeine" % "caffeine" % "3.1.8",
Expand All @@ -174,7 +173,7 @@ object Dependencies {
akkaHttpModule("akka-http-testkit") % Test,
"com.softwaremill.diffx" %% "diffx-core" % "0.9.0" % Test,
"com.softwaremill.diffx" %% "diffx-scalatest-should" % "0.9.0" % Test,
"io.grpc" % "grpc-inprocess" % "1.60.0" % Test
grpcModule("grpc-inprocess") % Test
) ++ Dependencies.console ++ Dependencies.logDeps ++ Dependencies.test
)

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.9.6
sbt.version=1.9.8
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ Seq(
"com.eed3si9n" % "sbt-assembly" % "2.1.5",
"com.github.sbt" % "sbt-native-packager" % "1.9.16",
"se.marcuslonnberg" % "sbt-docker" % "1.11.0",
"org.scala-js" % "sbt-scalajs" % "1.14.0",
"org.scala-js" % "sbt-scalajs" % "1.15.0",
"org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2",
"pl.project13.scala" % "sbt-jmh" % "0.4.6",
"pl.project13.scala" % "sbt-jmh" % "0.4.7",
"com.github.sbt" % "sbt-ci-release" % "1.5.12",
"com.lightbend.sbt" % "sbt-javaagent" % "0.1.6"
).map(addSbtPlugin)

libraryDependencies ++= Seq(
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.0",
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.1",
"org.hjson" % "hjson" % "3.1.0",
"org.vafer" % "jdeb" % "1.10" artifacts Artifact("jdeb", "jar", "jar"),
"org.slf4j" % "jcl-over-slf4j" % "2.0.9",
"org.slf4j" % "jcl-over-slf4j" % "2.0.11",
("com.spotify" % "docker-client" % "8.16.0")
.exclude("commons-logging", "commons-logging")
)
3 changes: 2 additions & 1 deletion ride-runner/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ inTask(assembly)(
case p
if p.endsWith(".proto") ||
p.endsWith("module-info.class") ||
p.endsWith("io.netty.versions.properties") =>
p.endsWith("io.netty.versions.properties") ||
p.endsWith(".kotlin_module") =>
MergeStrategy.discard

case "scala-collection-compat.properties" =>
Expand Down

0 comments on commit b9d603b

Please sign in to comment.