From cea33131a7946c3908466f6372c078c63d27d367 Mon Sep 17 00:00:00 2001 From: David An Date: Tue, 12 Nov 2024 14:28:30 -0500 Subject: [PATCH 1/3] consolidate scala, sbt, plugins updates --- build.sbt | 2 +- docker/build.sh | 2 +- docker/build_jar.sh | 2 +- project/build.properties | 2 +- project/plugins.sbt | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index dd90b628..ed683873 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ version := "0.2" organization := "org.broadinstitute" -scalaVersion := "2.13.10" +scalaVersion := "2.13.15" val akkaV = "2.6.18" val akkaHttpV = "10.2.7" diff --git a/docker/build.sh b/docker/build.sh index c0e2e920..44906260 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -89,7 +89,7 @@ fi function make_jar() { echo "building thurloe jar..." - docker run --rm -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:openjdk-17.0.2_1.7.2_2.13.10 /working/docker/install.sh /working + docker run --rm -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/docker/install.sh /working } function docker_cmd() diff --git a/docker/build_jar.sh b/docker/build_jar.sh index c4d80b5f..3456ec8b 100755 --- a/docker/build_jar.sh +++ b/docker/build_jar.sh @@ -10,7 +10,7 @@ echo "building thurloe jar..." docker run --rm -v $PWD:/working \ -v jar-cache:/root/.ivy \ --v jar-cache:/root/.ivy2 sbtscala/scala-sbt:openjdk-17.0.2_1.7.2_2.13.10 /working/docker/install.sh /working +-v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/docker/install.sh /working EXIT_CODE=$? diff --git a/project/build.properties b/project/build.properties index c8fcab54..db1723b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.10.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7c506cfa..ba86fd3b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,13 +1,13 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.1") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.5") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin( - "com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16" + "com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1" ) // Use `unusedCompileDependencies` to see unused dependencies -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") -addDependencyTreePlugin \ No newline at end of file +addDependencyTreePlugin From 1ad7c6f9fbd28ac4da6434bca7d5142500f4edfa Mon Sep 17 00:00:00 2001 From: David An Date: Tue, 12 Nov 2024 14:37:32 -0500 Subject: [PATCH 2/3] syntax tweaks for new compile errors --- src/main/scala/thurloe/service/ApiDataModels.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/thurloe/service/ApiDataModels.scala b/src/main/scala/thurloe/service/ApiDataModels.scala index 8efeccb7..2b26a8bb 100644 --- a/src/main/scala/thurloe/service/ApiDataModels.scala +++ b/src/main/scala/thurloe/service/ApiDataModels.scala @@ -5,13 +5,13 @@ import org.broadinstitute.dsde.workbench.model.WorkbenchIdentityJsonSupport.{ WorkbenchEmailFormat, WorkbenchUserIdFormat } -import spray.json.DefaultJsonProtocol +import spray.json.{DefaultJsonProtocol, RootJsonFormat} object ApiDataModelsJsonProtocol extends DefaultJsonProtocol { - implicit val keyValuePairFormat = jsonFormat2(KeyValuePair) - implicit val userKeyValuePairFormat = jsonFormat2(UserKeyValuePair) - implicit val userKeyValuePairsFormat = jsonFormat2(UserKeyValuePairs) - implicit val notificationFormat = jsonFormat7(Notification) + implicit val keyValuePairFormat: RootJsonFormat[KeyValuePair] = jsonFormat2(KeyValuePair) + implicit val userKeyValuePairFormat: RootJsonFormat[UserKeyValuePair] = jsonFormat2(UserKeyValuePair) + implicit val userKeyValuePairsFormat: RootJsonFormat[UserKeyValuePairs] = jsonFormat2(UserKeyValuePairs) + implicit val notificationFormat: RootJsonFormat[Notification] = jsonFormat7(Notification) } object ThurloeQuery { From ffbb8fa64859caacc1a997144fa8d8c49e52114f Mon Sep 17 00:00:00 2001 From: David An Date: Tue, 12 Nov 2024 14:46:29 -0500 Subject: [PATCH 3/3] update scalatest, mockito-scala-scalatest --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index ed683873..42e65a9c 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ val akkaV = "2.6.18" val akkaHttpV = "10.2.7" val slickV = "3.3.3" val workbenchGoogleV = "0.28-3ad3700" -val scalaTestV = "3.2.11" +val scalaTestV = "3.2.19" resolvers ++= Seq( "Broad Artifactory Releases" at "https://broadinstitute.jfrog.io/broadinstitute/libs-release/", @@ -58,7 +58,7 @@ libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-testkit" % akkaV % Test, "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % Test, "org.scalatest" %% "scalatest" % scalaTestV % Test, - "org.mockito" %% "mockito-scala-scalatest" % "1.17.12" % Test, + "org.mockito" %% "mockito-scala-scalatest" % "1.17.37" % Test, "org.yaml" % "snakeyaml" % "1.33" % Test )