diff --git a/jitpack.yml b/jitpack.yml index f079b6a..18243cb 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,6 +1,6 @@ jdk: - adoptopenjdk11 before_install: - - wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.3.13/sbt-launch-1.3.13.jar + - wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.5.4/sbt-launch-1.5.4.jar install: - - java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.3.13.jar -Dsbt.log.noformat=true clean publishM2 + - java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.5.4.jar -Dsbt.log.noformat=true clean publishM2 diff --git a/project/Libs.scala b/project/Libs.scala index debd217..0ef1dd3 100644 --- a/project/Libs.scala +++ b/project/Libs.scala @@ -6,31 +6,37 @@ object Libs { // 1.0.0-M1 does not work with Scala.js js yet val `scala-async` = "org.scala-lang.modules" %% "scala-async" % "0.10.0" - val `akka-stream` = "com.typesafe.akka" %% "akka-stream" % "2.6.14" - val `akka-actor-typed` = "com.typesafe.akka" %% "akka-actor-typed" % "2.6.14" - val `akka-actor-testkit-typed` = "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.14" - val `akka-stream-testkit` = "com.typesafe.akka" %% "akka-stream-testkit" % "2.6.14" + private val akkaVersion = "2.6.15" - val `akka-http` = "com.typesafe.akka" %% "akka-http" % "10.2.4" - val `akka-http-testkit` = "com.typesafe.akka" %% "akka-http-testkit" % "10.2.4" + val `akka-stream` = "com.typesafe.akka" %% "akka-stream" % akkaVersion + val `akka-actor-typed` = "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion + val `akka-actor-testkit-typed` = "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion + val `akka-stream-testkit` = "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion - val `borer-core` = dep("io.bullet" %%% "borer-core" % "1.7.2") - val `borer-derivation` = dep("io.bullet" %%% "borer-derivation" % "1.7.2") - val `borer-compat-akka` = "io.bullet" %% "borer-compat-akka" % "1.7.2" + private val akkaHttpVersion = "10.2.4" + + val `akka-http` = "com.typesafe.akka" %% "akka-http" % akkaHttpVersion + val `akka-http-testkit` = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion + + private val borerVersion = "1.7.2" + val `borer-core` = dep("io.bullet" %%% "borer-core" % borerVersion) + val `borer-derivation` = dep("io.bullet" %%% "borer-derivation" % borerVersion) + val `borer-compat-akka` = "io.bullet" %% "borer-compat-akka" % borerVersion val `akka-http-cors` = "ch.megard" %% "akka-http-cors" % "1.1.1" - val scalatest = dep("org.scalatest" %%% "scalatest" % "3.2.8") + val scalatest = dep("org.scalatest" %%% "scalatest" % "3.2.9") val `selenium-3-141` = "org.scalatestplus" %% "selenium-3-141" % "3.2.2.0" val `scalajs-dom` = dep("org.scala-js" %%% "scalajs-dom" % "1.1.0") val `tmt-typed` = dep("com.github.mushtaq.tmt-typed" %%% "tmt-typed" % "902393a") - val `rsocket-core` = "io.rsocket" % "rsocket-core" % "1.1.0" - val `rsocket-transport-netty` = "io.rsocket" % "rsocket-transport-netty" % "1.1.0" + private val rsocketVersion = "1.1.1" + val `rsocket-core` = "io.rsocket" % "rsocket-core" % rsocketVersion + val `rsocket-transport-netty` = "io.rsocket" % "rsocket-transport-netty" % rsocketVersion } object Prometheus { - val Version = "0.10.0" + val Version = "0.11.0" val simpleclient = "io.prometheus" % "simpleclient" % Version val simpleclient_common = "io.prometheus" % "simpleclient_common" % Version } diff --git a/project/build.properties b/project/build.properties index 19479ba..9edb75b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.2 +sbt.version=1.5.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9442623..d365aa5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.2") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")