From 7bc6a97d9681ddebf86f9095b9b63f22ce7f5cc2 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Mon, 13 Apr 2026 14:43:11 +0300 Subject: [PATCH] Bumped dependencies --- .github/workflows/check-pr.yaml | 48 ++++------------------ .github/workflows/publish-docker-image.yml | 2 +- build.sbt | 4 +- lang/jvm/build.sbt | 17 -------- project/Dependencies.scala | 20 ++++----- 5 files changed, 20 insertions(+), 71 deletions(-) diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml index d6ed8cc982..aa46cd1b06 100644 --- a/.github/workflows/check-pr.yaml +++ b/.github/workflows/check-pr.yaml @@ -22,39 +22,10 @@ jobs: gpg-private-key: ${{ secrets.OSSRH_GPG_KEY }} gpg-passphrase: ${{ secrets.OSSRH_GPG_PASSPHRASE }} - uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22 + - uses: proudust/gh-describe@d2398810d922ababf1ec0efb454e42953dfdc460 # v2.1.2 + id: ghd - name: Check PR - run: sbt -J-Xlog:gc*=debug:file=./gc.log --batch checkPR - #- if: always() - # name: Fix test names and durations for Qase - # run: | - # find node/tests/target/test-reports -name "*.xml" -exec sed -E -i \ - # -e 's/time="(0(\.0+)?|-0\.[0-9]+)"/time="0.001"/g' \ - # -e 's/name="([^"]*)(NODE-[0-9]+ )([^"]*)"/name="\2 \1\3"/g' {} + - # Temporarily disabled because of 402 Payment Required - # - uses: qase-tms/gh-actions/run-create@v1 - # if: always() - # id: qase-run-create - # with: - # token: ${{ secrets.QASE_API_TOKEN }} - # project: NODE - # title: Check PR ${{ github.run_id }} — ${{ github.head_ref || github.ref_name }} - # description: | - # PR [#${{ github.event.number }}](https://github.com/wavesplatform/Waves/pulls/${{ github.event.number }}) — Run [#${{ github.run_number }}](https://github.com/wavesplatform/Waves/actions/runs/${{ github.run_id }}) - # - uses: qase-tms/gh-actions/report@v1 - # if: always() && steps.qase-run-create.outcome == 'success' - # with: - # token: ${{ secrets.QASE_API_TOKEN }} - # project: NODE - # id: ${{ steps.qase-run-create.outputs.id }} - # format: junit - # path: node/tests/target/test-reports - # batch: 100 - # - uses: qase-tms/gh-actions/run-complete@v1 - # if: always() && steps.qase-run-create.outcome == 'success' - # with: - # token: ${{ secrets.QASE_API_TOKEN }} - # project: NODE - # id: ${{ steps.qase-run-create.outputs.id }} + run: sbt -Dproject.version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-) -J-Xlog:gc*=debug:file=./gc.log --batch checkPR - uses: scacap/action-surefire-report@5609ce4db72c09db044803b344a8968fd1f315da if: always() with: @@ -71,13 +42,8 @@ jobs: - 'project/*' - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 with: - name: waves-fat-jar + name: waves-all path: node/target/waves-all-*.jar - - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 - if: steps.filter.outputs.lang == 'true' - with: - name: file-compiler - path: lang/jvm/target/file-compiler.jar - name: Save debug data uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 if: always() @@ -103,7 +69,7 @@ jobs: java-version: '17' - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1 with: - name: waves-fat-jar + name: waves-all - run: java -cp '*' com.wavesplatform.utils.UtilApp smoke compile-contracts: @@ -128,8 +94,8 @@ jobs: java-version: '17' - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1 with: - name: file-compiler - - run: find -name "*.ride" -type f -exec java -jar file-compiler.jar {} +; + name: waves-all + - run: find -name "*.ride" -type f -exec java -cp '*' com.wavesplatform.lang.FileCompiler {} +; run-integration-tests: name: Run integration tests diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index f4f6f762ab..8328a6b889 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -52,7 +52,7 @@ jobs: with: ref: ${{ inputs.ref }} - uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3 - - uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73 + - uses: proudust/gh-describe@d2398810d922ababf1ec0efb454e42953dfdc460 # v2.1.2 id: ghd with: commit-ish: ${{ inputs.ref || github.sha}} diff --git a/build.sbt b/build.sbt index 50429e3d25..1c7fb9045d 100644 --- a/build.sbt +++ b/build.sbt @@ -170,7 +170,7 @@ lazy val `waves-node` = (project in file(".")) inScope(Global)( Seq( - scalaVersion := "3.8.1", + scalaVersion := "3.8.3", organization := "com.wavesplatform", organizationName := "Waves Platform", organizationHomepage := Some(url("https://wavesplatform.com")), @@ -260,7 +260,7 @@ checkPRRaw := Def ScopeFilter(inProjects(`lang-tests`, `repl-jvm`, `lang-tests-js`, `grpc-server`, `node-tests`, `ride-runner`), inConfigurations(Test)) ), fullOptJS.all(ScopeFilter(inProjects(`lang-js`, `repl-js`), inConfigurations(Compile))), - assembly.all(ScopeFilter(inProjects(node, `lang-jvm`))), + assembly.all(ScopeFilter(inProjects(node))), buildTarballsForDocker ) ) diff --git a/lang/jvm/build.sbt b/lang/jvm/build.sbt index b1e334399c..e51834e04d 100644 --- a/lang/jvm/build.sbt +++ b/lang/jvm/build.sbt @@ -9,20 +9,3 @@ developers := List( lazy val listComplexFunctions = inputKey[File]("List functions with complexity > 1") listComplexFunctions := Tasks.listComplexFunctions.evaluated - -inTask(assembly)( - Seq( - test := {}, - assemblyJarName := s"file-compiler.jar", - assemblyMergeStrategy := { - case p if p.endsWith(".proto") || p.endsWith("module-info.class") || p.endsWith("io.netty.versions.properties") => - MergeStrategy.discard - case "scala-collection-compat.properties" | "META-INF/versions/9/OSGI-INF/MANIFEST.MF" => - MergeStrategy.discard - case p if Set("scala/util/control/compat", "scala/collection/compat").exists(p.replace('\\', '/').contains) => - MergeStrategy.last - case other => - (assembly / assemblyMergeStrategy).value(other) - } - ) -) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ab25a695de..03a7a865e4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,15 +4,15 @@ import sbt.{Def, *} import scalapb.compiler.Version.scalapbVersion object Dependencies { - private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.10.Final" + private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.12.Final" - val gProtoVersion = "4.33.5" + val gProtoVersion = "4.34.1" val gProto = "com.google.protobuf" % "protobuf-java" % Dependencies.gProtoVersion val overrides = Def.setting( Seq( "org.scala-lang" %% "scala3-library" % scalaVersion.value, "com.google.code.gson" % "gson" % "2.13.2", - "com.squareup.okio" % "okio-jvm" % "3.16.4", + "com.squareup.okio" % "okio-jvm" % "3.17.0", "org.apache.httpcomponents" % "httpclient" % "4.5.14", "org.slf4j" % "slf4j-api" % "2.0.17", "org.msgpack" % "msgpack-core" % "0.9.11", @@ -34,7 +34,7 @@ object Dependencies { lazy val protoSchemasLib = "com.wavesplatform" % "protobuf-schemas" % "1.6.0" classifier "protobuf-src" intransitive () - private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.4.0" + private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.5.0" private def pekkoHttpModule(module: String, version: String = "1.3.0") = "org.apache.pekko" %% module % version @@ -46,20 +46,20 @@ 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.79.0" + private def grpcModule(module: String) = "io.grpc" % module % "1.80.0" val pekkoHttp = pekkoHttpModule("pekko-http") val googleGuava = "com.google.guava" % "guava" % "33.5.0-jre" val kamonCore = kamonModule("core") val machinist = "org.typelevel" %% "machinist" % "0.6.8" val logback = "ch.qos.logback" % "logback-classic" % "1.5.32" - val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "3.0.7" + val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "3.0.9" val curve25519 = "com.wavesplatform" % "curve25519-java" % "0.6.6" val nettyHandler = nettyModule("handler") val playJson = "org.playframework" %% "play-json" % "3.0.6" - val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test + val scalaTest = "org.scalatest" %% "scalatest" % "3.2.20" % Test val scalaJsTest = Def.setting("com.lihaoyi" %%% "utest" % "0.9.5" % Test) private def sttp3Module(module: String) = "com.softwaremill.sttp.client3" %% module % "3.11.0" @@ -106,9 +106,9 @@ object Dependencies { lazy val it = scalaTest +: Seq( logback, - "com.github.jnr" % "jnr-unixsocket" % "0.38.24", // To support Apple ARM + "com.github.jnr" % "jnr-unixsocket" % "0.38.25", // To support Apple ARM "com.spotify" % "docker-client" % "8.16.0", - jacksonModule("dataformat", "dataformat-properties", "2.21.0"), + jacksonModule("dataformat", "dataformat-properties", "2.21.2"), asyncHttpClient ).map(_ % Test) @@ -132,7 +132,7 @@ object Dependencies { lazy val node = Def.setting( Seq( rocksdb, - "commons-net" % "commons-net" % "3.12.0", + "commons-net" % "commons-net" % "3.13.0", "commons-io" % "commons-io" % "2.21.0", "com.github.pureconfig" %% "pureconfig-core" % "0.17.10", "com.github.pureconfig" %% "pureconfig-generic-scala3" % "0.17.10",