Skip to content

AJ-1784: scalaVersion to 2.13.15; update docker images to match #1444

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 3, 2024
Merged

AJ-1784: scalaVersion to 2.13.15; update docker images to match #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c4868
scalaVersion to 2.13.15; update docker images to match
davidangb Oct 3, 2024
865a884
update sbt-scoverage
davidangb Oct 3, 2024
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
2 changes: 1 addition & 1 deletion automation/Dockerfile-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15

COPY src /app/src
COPY test.sh /app
Expand Down
2 changes: 1 addition & 1 deletion automation/project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ object Settings {
val commonSettings =
commonBuildSettings ++ testSettings ++ List(
organization := "org.broadinstitute.dsde.firecloud",
scalaVersion := "2.13.14",
scalaVersion := "2.13.15",
resolvers := proxyResolvers ++: resolvers.value ++: commonResolvers,
scalacOptions ++= commonCompilerSettings,
dependencyOverrides ++= transitiveDependencyOverrides
Expand Down
2 changes: 1 addition & 1 deletion jenkins/ittests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -eux
./docker/run-es.sh start

# execute tests, overriding elasticsearch.urls to point at the linked container
SBT_IMAGE=sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14
SBT_IMAGE=sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15
docker run --rm \
--link elasticsearch-ittest:elasticsearch-ittest \
-v sbt-cache:/root/.sbt \
Expand Down
2 changes: 1 addition & 1 deletion local-dev/templates/docker-rsync-local-orch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ start_server () {
-p 5051:5051 \
--network=fc-orch \
-e JAVA_OPTS="$DOCKER_JAVA_OPTS" \
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14 \
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 \
bash -c "git config --global --add safe.directory /app && sbt \~reStart"

docker cp config/firecloud-account.pem orch-sbt:/etc/firecloud-account.pem
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ object Settings {
val commonSettings =
commonBuildSettings ++ commonAssemblySettings ++ commonTestSettings ++ List(
organization := "org.broadinstitute.dsde.firecloud",
scalaVersion := "2.13.14",
scalaVersion := "2.13.15",
resolvers := proxyResolvers ++: resolvers.value ++: commonResolvers,
scalacOptions ++= commonCompilerSettings,
dependencyOverrides ++= transitiveDependencyOverrides
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")

addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")

addDependencyTreePlugin
2 changes: 1 addition & 1 deletion script/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function make_jar()

docker run --rm -e GIT_MODEL_HASH=${GIT_MODEL_HASH} \
-v $PWD:/working -w /working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 \
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14 /working/src/docker/install.sh /working
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 /working/src/docker/install.sh /working
}

function docker_cmd()
Expand Down
2 changes: 1 addition & 1 deletion script/build_jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docker run --rm -e GIT_MODEL_HASH=${GIT_MODEL_HASH} \
-v $PWD:/working \
-v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 \
-w /working \
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14 /working/src/docker/clean_install.sh /working
sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 /working/src/docker/clean_install.sh /working

EXIT_CODE=$?

Expand Down
Loading