diff options
author | Juan J. MartÃnez <jjm@usebox.net> | 2022-04-16 20:23:19 +0000 |
---|---|---|
committer | Juan J. MartÃnez <jjm@usebox.net> | 2022-04-16 20:23:19 +0000 |
commit | f414fb1cf8f37ec0c1c6bbc3b7e0bebb48ec6435 (patch) | |
tree | 77ec1b1f18f8ac47fefe664746ac0ec9668a5aa5 | |
parent | f90e7bad9f1df2d652b82048e9073096ddc8df18 (diff) | |
parent | 5fa15e8cfe825e8e046728bd2ab56b48af8f99b2 (diff) | |
download | spacebeans-f414fb1cf8f37ec0c1c6bbc3b7e0bebb48ec6435.tar.gz spacebeans-f414fb1cf8f37ec0c1c6bbc3b7e0bebb48ec6435.zip |
Merge branch 'updated-dependencies' into 'main'
Upated mill and dependencies
See merge request reidrac/spacebeans!3
-rw-r--r-- | build.sc | 10 | ||||
-rwxr-xr-x | mill | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -2,13 +2,13 @@ import mill._ import mill.scalalib._ import scalafmt._ -import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1` +import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4` import de.tobiasroeser.mill.vcs.version.VcsVersion import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo object server extends ScalaModule with ScalafmtModule with BuildInfo { - def scalaVersion = "2.13.7" + def scalaVersion = "2.13.8" def scalacOptions = Seq( @@ -25,10 +25,10 @@ object server extends ScalaModule with ScalafmtModule with BuildInfo { def ivyDeps = Agg( - ivy"ch.qos.logback:logback-classic:1.2.10", + ivy"ch.qos.logback:logback-classic:1.2.11", ivy"com.github.pureconfig::pureconfig:0.17.1", ivy"com.github.scopt::scopt:4.0.1", - ivy"com.typesafe.akka::akka-stream:2.6.18", + ivy"com.typesafe.akka::akka-stream:2.6.19", ivy"org.bouncycastle:bcprov-jdk15to18:1.70", ivy"org.log4s::log4s:1.10.0" ) @@ -52,6 +52,6 @@ object server extends ScalaModule with ScalafmtModule with BuildInfo { } object test extends Tests with TestModule.ScalaTest with ScalafmtModule { - def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.2.10") + def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.2.11") } } @@ -3,7 +3,7 @@ # This is a wrapper script, that automatically download mill from GitHub release pages # You can give the required mill version with MILL_VERSION env variable # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION -DEFAULT_MILL_VERSION=0.9.12 +DEFAULT_MILL_VERSION=0.10.3 set -e |