Merge pull request #3 from tPl0ch/update/all-minor-patch

[UPGRADE] Upgrading minor-patch versions

build.sbt

@@ -1,16 +1,18 @@
-name := "joi-energy-scala"
-
-version := "0.1"
-
-scalaVersion := "2.13.1"
-
-mainClass in (Compile, run) := Some("com.tw.energy.WebApp")
-
-val circeVersion = "0.12.3"
-val akkaVersion = "2.6.1"
-val akkaHttpVersion = "10.1.11"
-val akkaHttpCirceVersion = "1.30.0"
-val scalaTestVersion = "3.1.0"
+inThisBuild(
+  List(
+    name := "joi-energy-scala",
+    version := "0.1",
+    scalaVersion := "2.13.10",
+    Compile / mainClass := Some("com.tw.energy.WebApp"),
+    run / mainClass := Some("com.tw.energy.WebApp"),
+  ),
+)
+
+val circeVersion = "0.14.5"
+val akkaVersion = "2.6.20"
+val akkaHttpVersion = "10.2.10"
+val akkaHttpCirceVersion = "1.39.2"
+val scalaTestVersion = "3.2.15"
 
 libraryDependencies += "com.typesafe.akka" %% "akka-http" % akkaHttpVersion // Http Server library: https://doc.akka.io/docs/akka-http/current/server-side/index.html
 libraryDependencies += "com.typesafe.akka" %% "akka-stream" % akkaVersion // Required by akka-http

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.3.7
+sbt.version = 1.8.2

src/main/scala/com/tw/energy/WebServer.scala

@@ -14,7 +14,7 @@ class WebServer(val route: Route, val host: String = "localhost", val port: Int
   implicit val executionContext: ExecutionContext = system.dispatcher
 
   def start(): RunningServer = {
-    new RunningServer(Http().bindAndHandle(route, host, port))
+    new RunningServer(Http().newServerAt(host, port).bindFlow(route))
   }
 
   class RunningServer(bindingFuture: Future[Http.ServerBinding]) {

src/test/scala/EndpointIntegrationTest.scala

@@ -1,7 +1,6 @@
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model._
-import akka.stream.ActorMaterializer
 import com.tw.energy.domain.MeterReadings
 import com.tw.energy.generator.Generator
 import com.tw.energy.{JOIEnergyApplication, WebServer}