Skip to content

Commit

Permalink
Merge pull request #1286 from UdashFramework/update/scala-2.13.15,com…
Browse files Browse the repository at this point in the history
…mons,analyzer,scalajs

Update scala 2.13.15, avs-common 2.20.0, analyzer 2.20.0, scalajs 1.17.0, sttp 3.10.0
  • Loading branch information
sebaciv authored Oct 7, 2024
2 parents 6d16f84 + 05922a3 commit 8e7c6f6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scala: [ 2.13.14 ]
scala: [ 2.13.15 ]
command: [ udash-jvm/test, udash-js/test, guide-selenium/test ]
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sbt.*
import sbt.Keys.scalaVersion

object Dependencies {
val versionOfScala = "2.13.14" //update .github/workflows/ci.yml as well
val versionOfScala = "2.13.15" //update .github/workflows/ci.yml as well

val jqueryWrapperVersion = "3.3.0"

Expand All @@ -14,7 +14,7 @@ object Dependencies {
val scalaCssVersion = "1.0.0"

val servletVersion = "4.0.1"
val avsCommonsVersion = "2.19.0"
val avsCommonsVersion = "2.20.0"

val atmosphereJSVersion = "3.1.3"
val atmosphereVersion = "2.7.14"
Expand All @@ -24,7 +24,7 @@ object Dependencies {
val circeDerivationVersion = "0.13.0-M5" // Tests only
val monixVersion = "3.4.1" // udash-rest only

val sttpVersion = "3.9.8"
val sttpVersion = "3.10.0"

val scalaLoggingVersion = "3.9.5"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ logLevel := Level.Warn
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/test/scala/io/udash/rpc/TestRPC.scala
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ trait RPCMethodsImpl extends RPCMethods {
onFire("handleMore", List(Nil))

override def doStuff(lol: Int, fuu: String)(cos: Option[Boolean]): Unit =
onFire("doStuff", List(List(lol, fuu), List(cos)))
onFire("doStuff", List(List[Any](lol, fuu), List(cos)))

override def doStuff(num: Int): Unit =
onFire("doStuffInt", List(List(num)))
Expand Down

0 comments on commit 8e7c6f6

Please sign in to comment.