From d05bbe4d64bedb0ed73d12602fc99cfaed1e1c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Manciot?= <stephane.manciot@gmail.com>
Date: Thu, 6 Feb 2025 09:26:58 +0100
Subject: [PATCH] upgrade dependencies and plugins

---
 build.sbt                                         | 15 ++++++++++-----
 project/Versions.scala                            |  7 +++++++
 project/protoc.sbt                                |  3 +++
 .../softnetwork/stuart/client/StuartApiSpec.scala |  4 ++--
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 project/Versions.scala
 create mode 100644 project/protoc.sbt

diff --git a/build.sbt b/build.sbt
index 82a6fce..cf3da53 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,26 +8,31 @@ organization := "app.softnetwork.stuart"
 
 name := "stuart-client-scala"
 
-version := "0.5.3"
+version := "0.6-SNAPSHOT"
 
 scalaVersion := "2.12.18"
 
-scalacOptions ++= Seq("-deprecation", "-feature")
+scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8", "-Ypartial-unification")
+
+javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
 
 Test / parallelExecution := false
 
 resolvers ++= Seq(
   "Softnetwork releases" at "https://softnetwork.jfrog.io/artifactory/releases/",
+  "Softnetwork snapshots" at "https://softnetwork.jfrog.io/artifactory/snapshots/",
   "Maven Central Server" at "https://repo1.maven.org/maven2",
   "Typesafe Server" at "https://repo.typesafe.com/typesafe/releases"
 )
 
 libraryDependencies ++=
   Seq(
+    "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf",
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
     "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.8",
-    "app.softnetwork.api" %% "generic-client-api" % "0.2.4",
-    "app.softnetwork.api" %% "generic-server-api" % "0.4.0",
-    "app.softnetwork.api" %% "generic-server-api-testkit" % "0.4.0" % Test,
+    "app.softnetwork.api" %% "generic-client-api" % Versions.clientApi,
+    "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
+    "app.softnetwork.api" %% "generic-server-api-testkit" % Versions.genericPersistence % Test,
     "org.apache.commons" % "commons-lang3" % "3.12.0"
   )
 
diff --git a/project/Versions.scala b/project/Versions.scala
new file mode 100644
index 0000000..369889e
--- /dev/null
+++ b/project/Versions.scala
@@ -0,0 +1,7 @@
+object Versions {
+
+  val genericPersistence = "0.6.2.1"
+
+  val clientApi = "0.3-SNAPSHOT"
+
+}
diff --git a/project/protoc.sbt b/project/protoc.sbt
new file mode 100644
index 0000000..107922f
--- /dev/null
+++ b/project/protoc.sbt
@@ -0,0 +1,3 @@
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.6")
+
+libraryDependencies += "org.vafer" % "jdeb" % "1.10" artifacts (Artifact("jdeb", "jar", "jar"))
\ No newline at end of file
diff --git a/src/test/scala/app/softnetwork/stuart/client/StuartApiSpec.scala b/src/test/scala/app/softnetwork/stuart/client/StuartApiSpec.scala
index 4b909b0..aa2b900 100644
--- a/src/test/scala/app/softnetwork/stuart/client/StuartApiSpec.scala
+++ b/src/test/scala/app/softnetwork/stuart/client/StuartApiSpec.scala
@@ -23,7 +23,7 @@ class StuartApiSpec extends AnyWordSpecLike with Matchers with StrictLogging {
 
   val client_reference: String = UUID.randomUUID().toString
 
-  val pickups = List(
+  val pickups: List[Pickup] = List(
     Pickup.defaultInstance
       .withAddress("12 rue rivoli, 75001 Paris")
       .withContact(
@@ -33,7 +33,7 @@ class StuartApiSpec extends AnyWordSpecLike with Matchers with StrictLogging {
           .withPhone("+33610101010")
       )
   )
-  val dropoffs = List(
+  val dropoffs: List[DropOff] = List(
     DropOff.defaultInstance
       .withClientReference(client_reference)
       .withPackageType(PackageType.small)