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

[WIP] Update to Play 2.9 #1118

Closed
wants to merge 1 commit into from
Closed
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
13 changes: 13 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ on:
pull_request:

jobs:
generate_app_secret:
runs-on: ubuntu-latest
outputs:
application_secret: ${{ steps.generate_app_secret.outputs.application_app_secret }}
steps:
- name: Generate Playframework APPLICATION_SECRET
id: generate_app_secret
run: echo "application_app_secret=$(openssl rand -base64 32)" >> "$GITHUB_OUTPUT"

sbt_formatChecks_dependencyTree:
runs-on: ubuntu-latest
steps:
Expand All @@ -27,6 +36,7 @@ jobs:

sbt_tests_jacoco:
runs-on: ubuntu-latest
needs: generate_app_secret
services:
postgis11:
image: postgis/postgis:13-3.3
Expand All @@ -48,6 +58,7 @@ jobs:
distribution: 'temurin'
- name: Run sbt tests with jacoco analysis
env:
APPLICATION_SECRET: ${{ needs.generate_app_secret.outputs.application_secret }}
CI: true
MR_TEST_DB_NAME: "mr_test"
MR_TEST_DB_USER: "osm"
Expand All @@ -57,6 +68,7 @@ jobs:

build:
runs-on: ubuntu-latest
needs: generate_app_secret
services:
postgis11:
image: postgis/postgis:13-3.3
Expand Down Expand Up @@ -95,6 +107,7 @@ jobs:
- name: Run maproulette and the maproulette-java-client integration tests
env:
# maproulette overrides
APPLICATION_SECRET: ${{ needs.generate_app_secret.outputs.application_secret }}
CI: true
SBT_OPTS: "-Xms512M -Xmx1024M -Xss2M -XX:MaxMetaspaceSize=1024M"
MR_SUPER_KEY: 1234
Expand Down
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ libraryDependencies ++= Seq(
guice,
// NOTE: Be careful upgrading sangria and play-json as binary incompatibilities can break graphql and the entire UI.
// See the compatibility matrix here https://github.com/sangria-graphql/sangria-play-json
"org.sangria-graphql" %% "sangria-play-json" % "2.0.1",
"org.sangria-graphql" %% "sangria" % "2.0.1",
"com.typesafe.play" %% "play-json-joda" % "2.8.2",
"com.typesafe.play" %% "play-json" % "2.8.2",
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
"org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % Test,
"org.sangria-graphql" %% "sangria-play-json-play29" % "2.0.3",
"org.sangria-graphql" %% "sangria" % "4.0.2",
"com.typesafe.play" %% "play-json-joda" % "2.10.5",
"com.typesafe.play" %% "play-json" % "2.10.5",
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
"org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % Test,
// NOTE: The swagger-ui package is used to obtain the static distribution of swagger-ui, the files included at runtime
// and are served by the webserver at route '/assets/lib/swagger-ui/'. We have a few customized swagger files in dir
// 'public/swagger'.
Expand All @@ -99,14 +99,14 @@ libraryDependencies ++= Seq(
// At some point other libraries will need to be updated to use the ServiceLoader mechanism and we can remove this.
// See https://www.slf4j.org/codes.html#ignoredBindings
"net.postgis" % "postgis-jdbc" % "2023.1.0" exclude ("org.slf4j", "slf4j-api"), // https://github.com/postgis/postgis-java/releases
"joda-time" % "joda-time" % "2.12.0",
"joda-time" % "joda-time" % "2.12.7",
// https://github.com/locationtech/jts/releases
"org.locationtech.jts" % "jts-core" % "1.19.0",
"org.wololo" % "jts2geojson" % "0.18.1", // https://github.com/bjornharrtell/jts2geojson/releases
"org.apache.commons" % "commons-lang3" % "3.12.0",
"commons-codec" % "commons-codec" % "1.14",
"com.typesafe.play" %% "play-mailer" % "8.0.1",
"com.typesafe.play" %% "play-mailer-guice" % "8.0.1",
"com.typesafe.play" %% "play-mailer" % "9.0.0",
"com.typesafe.play" %% "play-mailer-guice" % "9.0.0",
"com.typesafe.akka" %% "akka-cluster-tools" % "2.6.21",
"com.typesafe.akka" %% "akka-cluster-typed" % "2.6.21",
"com.typesafe.akka" %% "akka-slf4j" % "2.6.21",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://github.com/sbt/sbt/releases
sbt.version=1.7.2
sbt.version=1.9.9
7 changes: 6 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ logLevel := Level.Warn
addDependencyTreePlugin

// https://github.com/playframework/playframework/releases
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.3")

addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")

Expand All @@ -20,3 +20,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.3")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")

// https://github.com/sbt/sbt/issues/6997
ThisBuild / libraryDependencySchemes ++= Seq(
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
)
Loading