Skip to content

Commit aa03615

Browse files
authored
uptake playframework 3.0.10, scala 2.13.18 (#152)
1 parent 9d47a64 commit aa03615

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
val slickVersion = "3.5.2"
22
// make sure this is the same as the playWS's dependency
33
val pekkoVersion = "1.0.3"
4-
val playJsonVersion = "3.0.4"
5-
val jacksonVersion = "2.18.0"
4+
val playJsonVersion = "3.0.6"
5+
val jacksonVersion = "2.18.5"
66
val awsVersion = "2.34.+"
77
val stubbornVersion = "3.1.0"
88
val prometheusVersion = "0.16.0"
@@ -30,7 +30,7 @@ val prometheusHotSpot = "io.prometheus" % "simpleclient_hotspot"
3030

3131
lazy val commonSettings = Seq(
3232
scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint"), // , "-Xfatal-warnings"),
33-
scalaVersion := "2.13.15",
33+
scalaVersion := "2.13.18",
3434
libraryDependencies += scalaTestArtifact,
3535
organization := "com.salesforce.mce",
3636
headerLicense := Some(HeaderLicense.Custom(

docker-compose.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@ services:
2222
# command:
2323
# sbt orchardWS/run
2424
db:
25-
image: postgres
25+
image: postgres:17
2626
volumes:
2727
- orchard-postgres-data:/var/lib/postgresql/data
2828
environment:
2929
POSTGRES_PASSWORD: "${ORCHARD_PG_SECRET}"
30+
healthcheck:
31+
test: ["CMD-SHELL", "pg_isready -U postgres"]
32+
interval: 5s
33+
timeout: 5s
34+
retries: 5
3035
flyway:
3136
image: flyway/flyway
3237
volumes:
@@ -36,7 +41,8 @@ services:
3641
FLYWAY_USER: "postgres"
3742
FLYWAY_PASSWORD: "${ORCHARD_PG_SECRET}"
3843
depends_on:
39-
- db
44+
db:
45+
condition: service_healthy
4046
command:
4147
migrate
4248

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.0
1+
sbt.version=1.12.3

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
22

3-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")
3+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
44

55
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
66

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ThisBuild / version := "0.29.0"
1+
ThisBuild / version := "0.29.1"

0 commit comments

Comments
 (0)