sbt improvelemnts

.gitignore

@@ -75,6 +75,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp/
 
 # Scala-IDE specific
 .scala_dependencies

build.sbt

@@ -5,12 +5,3 @@ scalaVersion := "2.13.6"
 scalacOptions ++= Seq("-deprecation", "-feature")
 
 enablePlugins(JavaAppPackaging)
-
-assemblyMergeStrategy in assembly := {
-  case PathList("META-INF", xs @ _*) => MergeStrategy.discard
-  case "application.conf" => MergeStrategy.concat
-  case "module-info.class" => MergeStrategy.first
-  case x =>
-    val oldStrategy = (assemblyMergeStrategy in assembly).value
-    oldStrategy(x)
-}

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.3.3
+sbt.version = 1.6.1

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.4")
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
+addDependencyTreePlugin

src/main/scala/me/arcanis/ffxivbis/http/RootEndpoint.scala

@@ -25,7 +25,7 @@ class RootEndpoint(system: ActorSystem[Nothing], storage: ActorRef[Message], pro
   private val config = system.settings.config
 
   implicit val scheduler: Scheduler = system.scheduler
-  implicit val timeout: Timeout = config.getDuration("me.arcanis.ffxivbis.settings.request-timeout")
+  implicit val timeout: Timeout = config.getTimeout("me.arcanis.ffxivbis.settings.request-timeout")
 
   private val auth = AuthorizationProvider(config, storage, timeout, scheduler)
 

src/main/scala/me/arcanis/ffxivbis/service/PartyService.scala

@@ -24,14 +24,14 @@ class PartyService(context: ActorContext[Message], storage: ActorRef[DatabaseMes
   with StrictLogging {
   import me.arcanis.ffxivbis.utils.Implicits._
 
-  private val cacheTimeout: FiniteDuration =
-    context.system.settings.config.getDuration("me.arcanis.ffxivbis.settings.cache-timeout")
+  private val cacheTimeout =
+    context.system.settings.config.getFiniteDuration("me.arcanis.ffxivbis.settings.cache-timeout")
   implicit private val executionContext: ExecutionContext = {
     val selector = DispatcherSelector.fromConfig("me.arcanis.ffxivbis.default-dispatcher")
     context.system.dispatchers.lookup(selector)
   }
   implicit private val timeout: Timeout =
-    context.system.settings.config.getDuration("me.arcanis.ffxivbis.settings.request-timeout")
+    context.system.settings.config.getTimeout("me.arcanis.ffxivbis.settings.request-timeout")
   implicit private val scheduler: Scheduler = context.system.scheduler
 
   override def onMessage(msg: Message): Behavior[Message] = handle(Map.empty)(msg)

src/main/scala/me/arcanis/ffxivbis/utils/Implicits.scala

@@ -11,7 +11,6 @@ package me.arcanis.ffxivbis.utils
 import akka.util.Timeout
 import com.typesafe.config.Config
 
-import java.time.Duration
 import java.util.concurrent.TimeUnit
 import scala.concurrent.duration.FiniteDuration
 import scala.language.implicitConversions
@@ -19,20 +18,14 @@ import scala.util.Try
 
 object Implicits {
 
-  implicit def getBooleanFromOptionString(maybeYes: Option[String]): Boolean = maybeYes.map(_.toLowerCase) match {
-    case Some("yes" | "on") => true
-    case _ => false
-  }
-
-  implicit def getFiniteDuration(duration: Duration): FiniteDuration =
-    FiniteDuration(duration.toNanos, TimeUnit.NANOSECONDS)
-
-  implicit def getTimeout(duration: Duration): Timeout =
-    FiniteDuration(duration.toNanos, TimeUnit.NANOSECONDS)
-
   implicit class ConfigExtension(config: Config) {
 
+    def getFiniteDuration(path: String): FiniteDuration =
+      FiniteDuration(config.getDuration(path, TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
+
     def getOptString(path: String): Option[String] =
       Try(config.getString(path)).toOption.filter(_.nonEmpty)
+
+    def getTimeout(path: String): Timeout = getFiniteDuration(path)
   }
 }