Merge branch 'master' into update/scalatest-3.2.14

Author: github-actions[bot]

.github/workflows/Test.yml

@@ -24,10 +24,10 @@ jobs:
         cache: 'sbt'
 
     - name: Run tests and create coverage report
-      run: sbt clean coverage test coverageReport
+      run: sbt clean coverage test assembly coverageReport
 
     - name: Upload coverage report
       uses: actions/upload-artifact@v3
       with:
         name: scoverage-report
-        path: target/scala-2.13/scoverage-report/
+        path: target/scala-2.13/scoverage-report/

build.sbt

@@ -1,20 +1,28 @@
-ThisBuild / scalaVersion := "2.13.8"
-run / fork := true
-
-libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor-typed" % "2.6.20",
-  "com.typesafe.akka" %% "akka-stream" % "2.6.20",
-  "com.typesafe.akka" %% "akka-http" % "10.2.10",
-  "ch.qos.logback" % "logback-classic" % "1.4.0",
-  "org.scalactic" %% "scalactic" % "3.2.13",
-  "org.scalatest" %% "scalatest" % "3.2.13" % Test
-)
-
-enablePlugins(JavaAppPackaging)
-enablePlugins(DockerPlugin)
-
-Docker / packageName := "sample-webapp"
-Docker / version := "2.0.0"
-
-dockerBaseImage := "openjdk:latest"
-dockerExposedPorts := List(8080)
+ThisBuild / scalaVersion := "2.13.8"
+run / fork := true
+
+libraryDependencies ++= Seq(
+  "com.typesafe.akka" %% "akka-actor-typed" % "2.6.20",
+  "com.typesafe.akka" %% "akka-stream" % "2.6.20",
+  "com.typesafe.akka" %% "akka-http" % "10.2.10",
+  "ch.qos.logback" % "logback-classic" % "1.4.0",
+  "org.scalactic" %% "scalactic" % "3.2.14",
+  "org.scalatest" %% "scalatest" % "3.2.13" % Test
+)
+
+enablePlugins(JavaAppPackaging)
+enablePlugins(DockerPlugin)
+
+Docker / packageName := "sample-webapp"
+Docker / version := "2.0.0"
+
+dockerBaseImage := "openjdk:latest"
+dockerExposedPorts := List(8080)
+
+assembly / mainClass := Some("Main")
+ThisBuild / assemblyMergeStrategy := {
+  case "module-info.class" => MergeStrategy.discard
+  case x =>
+    val oldStrategy = (assembly / assemblyMergeStrategy).value
+    oldStrategy(x)
+}

project/plugins.sbt

@@ -1,2 +1,3 @@
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.2")