aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan J. Martinez <jjm@usebox.net>2023-10-08 09:54:51 +0100
committerJuan J. Martinez <jjm@usebox.net>2023-10-08 09:54:51 +0100
commitb7e4076cf52d5a7a0847b84c236ca145ef1b1ff9 (patch)
tree00bc389c054b14d089b2d04399d8598f100abf31
parente8d1a32d7baedc3fd1a82c159456f54cd8131c05 (diff)
downloadspacebeans-b7e4076cf52d5a7a0847b84c236ca145ef1b1ff9.tar.gz
spacebeans-b7e4076cf52d5a7a0847b84c236ca145ef1b1ff9.zip
Update dependencies, mill and bump Scala version
-rw-r--r--CHANGES.md6
-rw-r--r--README.md2
-rw-r--r--build.sc10
-rwxr-xr-xmill2
4 files changed, 13 insertions, 7 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c784f02..616c374 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
# What's new?
+## Release 1.3.? - 2023-??-??
+
+ - Updates Scala version to 3.13.12.
+ - Updated dependencies.
+ - Updated mill (development).
+
## Release 1.3.6 - 2023-08-08
- Updated dependencies.
diff --git a/README.md b/README.md
index 92f6db2..5fd39e9 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ Requirements:
Run the server with `./mill server.run` and the tests with `./mill server.test`.
To build the `jar` bundle, run `./mill server.assembly` and the result will be generated
-in `out/server/assembly/dest/`.
+in `out/server/assembly.dest/`.
The sources must be formatted with `scalafmt`, either via your editor or running:
diff --git a/build.sc b/build.sc
index d3300e7..6f04625 100644
--- a/build.sc
+++ b/build.sc
@@ -1,5 +1,5 @@
import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import mill._
import mill.contrib.buildinfo.BuildInfo
@@ -7,7 +7,7 @@ import mill.scalalib._
import scalafmt._
object server extends ScalaModule with ScalafmtModule with BuildInfo {
- def scalaVersion = "2.13.11"
+ def scalaVersion = "2.13.12"
def scalacOptions =
Seq(
@@ -24,7 +24,7 @@ object server extends ScalaModule with ScalafmtModule with BuildInfo {
def ivyDeps =
Agg(
- ivy"ch.qos.logback:logback-classic:1.4.9",
+ ivy"ch.qos.logback:logback-classic:1.4.11",
ivy"com.github.pureconfig::pureconfig:0.17.4",
ivy"com.github.scopt::scopt:4.1.0",
ivy"org.apache.pekko::pekko-stream:1.0.1",
@@ -45,12 +45,12 @@ object server extends ScalaModule with ScalafmtModule with BuildInfo {
def assembly =
T {
val version = VcsVersion.vcsState().format()
- val spacePath = T.ctx.dest / (name + "-" + version + ".jar")
+ val spacePath = T.dest / (name + "-" + version + ".jar")
os.move(super.assembly().path, spacePath)
PathRef(spacePath)
}
object test extends Tests with TestModule.ScalaTest with ScalafmtModule {
- def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.2.16")
+ def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.2.17")
}
}
diff --git a/mill b/mill
index bbae120..21625f6 100755
--- a/mill
+++ b/mill
@@ -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.10.10
+DEFAULT_MILL_VERSION=0.10.12
set -e