bump dependencies

TODO.md

@@ -0,0 +1,3 @@
+* [x] items improvements
+* [x] multiple parties support
+* [ ] pretty UI

build.sbt

@@ -2,7 +2,7 @@ organization := "me.arcanis"
 
 name := "ffxivbis"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.8"
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 

libraries.sbt

@@ -1,25 +1,26 @@
-val AkkaVersion = "2.8.6"
-val AkkaHttpVersion = "10.5.3"
-val ScalaTestVersion = "3.2.19"
+val AkkaVersion = "2.6.19"
+val AkkaHttpVersion = "10.2.9"
+val ScalaTestVersion = "3.2.12"
+val SlickVersion = "3.3.3"
 
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.6"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.11"
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
 
 libraryDependencies += "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-stream" % AkkaVersion
-libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.11.0"
-libraryDependencies += "jakarta.platform" % "jakarta.jakartaee-web-api" % "10.0.0"
-libraryDependencies += "ch.megard" %% "akka-http-cors" % "1.2.0"
+libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.8.0"
+libraryDependencies += "jakarta.platform" % "jakarta.jakartaee-web-api" % "9.1.0"
+libraryDependencies += "ch.megard" %% "akka-http-cors" % "1.1.3"
 
 libraryDependencies += "io.spray" %%  "spray-json" % "1.3.6"
 
-libraryDependencies += "org.playframework.anorm" %% "anorm" % "2.7.0"
-libraryDependencies += "com.zaxxer" % "HikariCP" % "5.1.0" exclude("org.slf4j", "slf4j-api")
-libraryDependencies += "org.flywaydb" % "flyway-core" % "9.16.0"
-libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.46.0.0"
-libraryDependencies += "org.postgresql" % "postgresql" % "42.7.3"
+libraryDependencies += "org.playframework.anorm" %% "anorm" % "2.6.10"
+libraryDependencies += "com.zaxxer" % "HikariCP" % "5.0.1" exclude("org.slf4j", "slf4j-api")
+libraryDependencies += "org.flywaydb" % "flyway-core" % "9.2.0"
+libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.39.2.1"
+libraryDependencies += "org.postgresql" % "postgresql" % "42.5.0"
 
 libraryDependencies += "org.mindrot" % "jbcrypt" % "0.4"
 libraryDependencies += "com.google.guava" % "guava" % "31.0.1-jre"

src/main/scala/me/arcanis/ffxivbis/models/Job.scala

@@ -95,7 +95,6 @@ object Job {
   case object RPR extends Drgs
   case object NIN extends Nins
   case object SAM extends Mnks
-  case object VPR extends Mnks
 
   case object BRD extends Ranges
   case object MCH extends Ranges
@@ -104,10 +103,9 @@ object Job {
   case object BLM extends Casters
   case object SMN extends Casters
   case object RDM extends Casters
-  case object PCT extends Casters
 
   val available: Seq[Job] =
-    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, SGE, MNK, DRG, RPR, NIN, SAM, VPR, BRD, MCH, DNC, BLM, SMN, RDM, PCT)
+    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, SGE, MNK, DRG, RPR, NIN, SAM, BRD, MCH, DNC, BLM, SMN, RDM)
   val availableWithAnyJob: Seq[Job] = available.prepended(AnyJob)
 
   def withName(job: String): Job =

src/main/scala/me/arcanis/ffxivbis/service/bis/XivApi.scala

@@ -15,7 +15,6 @@ import spray.json._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.jdk.CollectionConverters._
 import scala.util.Try
-import scala.util.matching.Regex
 
 trait XivApi extends RequestExecutor {
 
@@ -78,8 +77,6 @@ object XivApi {
 
   private val defaultShop = JsObject("IsUnique" -> JsNumber(1), "StackSize" -> JsNumber(999))
 
-  private val itemRegexp = new Regex("""Item(Receive|Cost)(\d+)""", "type", "index")
-
   private def parseXivapiJsonToShop(
     js: JsObject
   )(implicit executionContext: ExecutionContext): Future[Map[Long, (String, Long)]] = {
@@ -89,12 +86,12 @@ object XivApi {
         .map(_ => "crafted" -> -1L) // you can craft this item
         .orElse { // lets try shop items
           js.fields("SpecialShop").asJsObject.fields.collectFirst {
-            case (shopName, JsArray(array)) if itemRegexp.matches(shopName) =>
+            case (shopName, JsArray(array)) if shopName.startsWith("ItemReceive") =>
               val shopId = array.head match {
                 case JsNumber(id) => id.toLong
                 case other => throw deserializationError(s"Could not parse $other")
               }
-              itemRegexp.findFirstMatchIn(shopName).get.group("index") -> shopId
+              shopName.replace("ItemReceive", "") -> shopId
           }
         }
         .getOrElse(throw deserializationError(s"Could not parse $js"))

version.sbt

@@ -1 +1 @@
-version := "0.15.1"
+version := "0.13.6"