Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE-69: scala, sbt, plugins updates #350

Merged
merged 3 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ version := "0.2"

organization := "org.broadinstitute"

scalaVersion := "2.13.10"
scalaVersion := "2.13.15"

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/",
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion docker/build_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.10.5
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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
addDependencyTreePlugin
10 changes: 5 additions & 5 deletions src/main/scala/thurloe/service/ApiDataModels.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading