Skip to content

Commit fa5786d

Browse files
phearnotphearnot
committed
Bumped dependencies
1 parent 52acd9d commit fa5786d

5 files changed

Lines changed: 18 additions & 69 deletions

File tree

‎.github/workflows/check-pr.yaml‎

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,10 @@ jobs:
2222
gpg-private-key: ${{ secrets.OSSRH_GPG_KEY }}
2323
gpg-passphrase: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
2424
- uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22
25+
- uses: proudust/gh-describe@d2398810d922ababf1ec0efb454e42953dfdc460 # v2.1.2
26+
id: ghd
2527
- name: Check PR
26-
run: sbt -J-Xlog:gc*=debug:file=./gc.log --batch checkPR
27-
#- if: always()
28-
# name: Fix test names and durations for Qase
29-
# run: |
30-
# find node/tests/target/test-reports -name "*.xml" -exec sed -E -i \
31-
# -e 's/time="(0(\.0+)?|-0\.[0-9]+)"/time="0.001"/g' \
32-
# -e 's/name="([^"]*)(NODE-[0-9]+ )([^"]*)"/name="\2 \1\3"/g' {} +
33-
# Temporarily disabled because of 402 Payment Required
34-
# - uses: qase-tms/gh-actions/run-create@v1
35-
# if: always()
36-
# id: qase-run-create
37-
# with:
38-
# token: ${{ secrets.QASE_API_TOKEN }}
39-
# project: NODE
40-
# title: Check PR ${{ github.run_id }} — ${{ github.head_ref || github.ref_name }}
41-
# description: |
42-
# 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 }})
43-
# - uses: qase-tms/gh-actions/report@v1
44-
# if: always() && steps.qase-run-create.outcome == 'success'
45-
# with:
46-
# token: ${{ secrets.QASE_API_TOKEN }}
47-
# project: NODE
48-
# id: ${{ steps.qase-run-create.outputs.id }}
49-
# format: junit
50-
# path: node/tests/target/test-reports
51-
# batch: 100
52-
# - uses: qase-tms/gh-actions/run-complete@v1
53-
# if: always() && steps.qase-run-create.outcome == 'success'
54-
# with:
55-
# token: ${{ secrets.QASE_API_TOKEN }}
56-
# project: NODE
57-
# id: ${{ steps.qase-run-create.outputs.id }}
28+
run: sbt -Dproject.version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-) -J-Xlog:gc*=debug:file=./gc.log --batch checkPR
5829
- uses: scacap/action-surefire-report@5609ce4db72c09db044803b344a8968fd1f315da
5930
if: always()
6031
with:
@@ -73,11 +44,6 @@ jobs:
7344
with:
7445
name: waves-fat-jar
7546
path: node/target/waves-all-*.jar
76-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
77-
if: steps.filter.outputs.lang == 'true'
78-
with:
79-
name: file-compiler
80-
path: lang/jvm/target/file-compiler.jar
8147
- name: Save debug data
8248
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
8349
if: always()
@@ -128,8 +94,8 @@ jobs:
12894
java-version: '17'
12995
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1
13096
with:
131-
name: file-compiler
132-
- run: find -name "*.ride" -type f -exec java -jar file-compiler.jar {} +;
97+
name: waves-all
98+
- run: find -name "*.ride" -type f -exec java -cp '*' com.wavesplatform.lang.FileCompiler {} +;
13399

134100
run-integration-tests:
135101
name: Run integration tests

‎.github/workflows/publish-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
ref: ${{ inputs.ref }}
5454
- uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3
55-
- uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73
55+
- uses: proudust/gh-describe@d2398810d922ababf1ec0efb454e42953dfdc460 # v2.1.2
5656
id: ghd
5757
with:
5858
commit-ish: ${{ inputs.ref || github.sha}}

‎build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ lazy val `waves-node` = (project in file("."))
170170

171171
inScope(Global)(
172172
Seq(
173-
scalaVersion := "3.8.1",
173+
scalaVersion := "3.8.3",
174174
organization := "com.wavesplatform",
175175
organizationName := "Waves Platform",
176176
organizationHomepage := Some(url("https://wavesplatform.com")),
@@ -260,7 +260,7 @@ checkPRRaw := Def
260260
ScopeFilter(inProjects(`lang-tests`, `repl-jvm`, `lang-tests-js`, `grpc-server`, `node-tests`, `ride-runner`), inConfigurations(Test))
261261
),
262262
fullOptJS.all(ScopeFilter(inProjects(`lang-js`, `repl-js`), inConfigurations(Compile))),
263-
assembly.all(ScopeFilter(inProjects(node, `lang-jvm`))),
263+
assembly.all(ScopeFilter(inProjects(node))),
264264
buildTarballsForDocker
265265
)
266266
)

‎lang/jvm/build.sbt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,3 @@ developers := List(
99
lazy val listComplexFunctions = inputKey[File]("List functions with complexity > 1")
1010

1111
listComplexFunctions := Tasks.listComplexFunctions.evaluated
12-
13-
inTask(assembly)(
14-
Seq(
15-
test := {},
16-
assemblyJarName := s"file-compiler.jar",
17-
assemblyMergeStrategy := {
18-
case p if p.endsWith(".proto") || p.endsWith("module-info.class") || p.endsWith("io.netty.versions.properties") =>
19-
MergeStrategy.discard
20-
case "scala-collection-compat.properties" | "META-INF/versions/9/OSGI-INF/MANIFEST.MF" =>
21-
MergeStrategy.discard
22-
case p if Set("scala/util/control/compat", "scala/collection/compat").exists(p.replace('\\', '/').contains) =>
23-
MergeStrategy.last
24-
case other =>
25-
(assembly / assemblyMergeStrategy).value(other)
26-
}
27-
)
28-
)

‎project/Dependencies.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import sbt.{Def, *}
44
import scalapb.compiler.Version.scalapbVersion
55

66
object Dependencies {
7-
private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.10.Final"
7+
private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.12.Final"
88

9-
val gProtoVersion = "4.33.5"
9+
val gProtoVersion = "4.34.1"
1010
val gProto = "com.google.protobuf" % "protobuf-java" % Dependencies.gProtoVersion
1111
val overrides = Def.setting(
1212
Seq(
1313
"org.scala-lang" %% "scala3-library" % scalaVersion.value,
1414
"com.google.code.gson" % "gson" % "2.13.2",
15-
"com.squareup.okio" % "okio-jvm" % "3.16.4",
15+
"com.squareup.okio" % "okio-jvm" % "3.17.0",
1616
"org.apache.httpcomponents" % "httpclient" % "4.5.14",
1717
"org.slf4j" % "slf4j-api" % "2.0.17",
1818
"org.msgpack" % "msgpack-core" % "0.9.11",
@@ -34,7 +34,7 @@ object Dependencies {
3434
lazy val protoSchemasLib =
3535
"com.wavesplatform" % "protobuf-schemas" % "1.6.0" classifier "protobuf-src" intransitive ()
3636

37-
private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.4.0"
37+
private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.5.0"
3838

3939
private def pekkoHttpModule(module: String, version: String = "1.3.0") = "org.apache.pekko" %% module % version
4040

@@ -46,20 +46,20 @@ object Dependencies {
4646

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

49-
private def grpcModule(module: String) = "io.grpc" % module % "1.79.0"
49+
private def grpcModule(module: String) = "io.grpc" % module % "1.80.0"
5050

5151
val pekkoHttp = pekkoHttpModule("pekko-http")
5252
val googleGuava = "com.google.guava" % "guava" % "33.5.0-jre"
5353
val kamonCore = kamonModule("core")
5454
val machinist = "org.typelevel" %% "machinist" % "0.6.8"
5555
val logback = "ch.qos.logback" % "logback-classic" % "1.5.32"
56-
val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "3.0.7"
56+
val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "3.0.9"
5757
val curve25519 = "com.wavesplatform" % "curve25519-java" % "0.6.6"
5858
val nettyHandler = nettyModule("handler")
5959

6060
val playJson = "org.playframework" %% "play-json" % "3.0.6"
6161

62-
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test
62+
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.20" % Test
6363
val scalaJsTest = Def.setting("com.lihaoyi" %%% "utest" % "0.9.5" % Test)
6464

6565
private def sttp3Module(module: String) = "com.softwaremill.sttp.client3" %% module % "3.11.0"
@@ -106,9 +106,9 @@ object Dependencies {
106106

107107
lazy val it = scalaTest +: Seq(
108108
logback,
109-
"com.github.jnr" % "jnr-unixsocket" % "0.38.24", // To support Apple ARM
109+
"com.github.jnr" % "jnr-unixsocket" % "0.38.25", // To support Apple ARM
110110
"com.spotify" % "docker-client" % "8.16.0",
111-
jacksonModule("dataformat", "dataformat-properties", "2.21.0"),
111+
jacksonModule("dataformat", "dataformat-properties", "2.21.2"),
112112
asyncHttpClient
113113
).map(_ % Test)
114114

@@ -132,7 +132,7 @@ object Dependencies {
132132
lazy val node = Def.setting(
133133
Seq(
134134
rocksdb,
135-
"commons-net" % "commons-net" % "3.12.0",
135+
"commons-net" % "commons-net" % "3.13.0",
136136
"commons-io" % "commons-io" % "2.21.0",
137137
"com.github.pureconfig" %% "pureconfig-core" % "0.17.10",
138138
"com.github.pureconfig" %% "pureconfig-generic-scala3" % "0.17.10",

0 commit comments

Comments
 (0)