Migrate to Play 3

- Update dependencies, SBT version
- Update to Play version 3 and compatible Slick version
- Update to the latest Java LTS version 21

Closes #37

.github/workflows/ci.yml

@@ -9,10 +9,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
           cache: 'sbt'
       - name: Compile, test
-        run: sbt clean coverage test IntegrationTest/test coverageReport
+        run: sbt clean coverage test integration/test coverageReport
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         env:

build.sbt

@@ -2,14 +2,14 @@ import ReleaseTransformations._
 
 val commonSettings = Seq(
   organization := "io.toolsplus",
-  scalaVersion := "2.13.2"
+  scalaVersion := "2.13.14",
 )
 
-val integrationTestSettings = Defaults.itSettings ++ Seq(
-  IntegrationTest / fork := true,
-  IntegrationTest / testOptions += Tests.Argument(TestFrameworks.ScalaTest,
-    "-u",
-    "target/test-reports")
+val integrationTestSettings = Seq(
+  Test / fork := true,
+  Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest,
+                                       "-u",
+                                       "target/test-reports")
 )
 
 lazy val publishSettings = Seq(
@@ -19,7 +19,7 @@ lazy val publishSettings = Seq(
   licenses := Seq(
     "Apache 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")),
   publishMavenStyle := true,
-  publishArtifact in Test := false,
+  Test / publishArtifact := false,
   pomIncludeRepository := { _ =>
     false
   },
@@ -79,7 +79,15 @@ lazy val `atlassian-connect-play-slick` = project
   .in(file("."))
   .settings(libraryDependencies ++= Dependencies.root)
   .settings(commonSettings: _*)
-  .settings(integrationTestSettings: _*)
   .settings(publishSettings)
   .settings(moduleSettings(project))
-  .configs(IntegrationTest)
+
+lazy val `integration` = project
+  .in(file("integration"))
+  .settings(libraryDependencies ++= Dependencies.integration)
+  .settings(commonSettings: _*)
+  .settings(integrationTestSettings: _*)
+  .settings(
+    publish / skip := true,
+  )
+  .dependsOn(`atlassian-connect-play-slick`)

integration/src/test/resources/logback-test.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+
+<configuration>
+    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+    <import class="ch.qos.logback.core.ConsoleAppender"/>
+
+    <appender name="STDOUT" class="ConsoleAppender">
+        <encoder class="PatternLayoutEncoder">
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

project/CommonSettings.scala

@@ -4,7 +4,7 @@ import sbt.Keys._
 object CommonSettings extends AutoPlugin {
 
   override def projectSettings = Seq(
-    parallelExecution in Test := false,
-    fork in Test := true
+    Test / parallelExecution := false,
+    Test / fork := true
   )
 }

project/Dependencies.scala

@@ -4,35 +4,42 @@ object Dependencies {
   val root = Seq(
     Library.playSlick,
     Library.atlassianConnectApi,
-    Library.playSlickEvolutions % "test, it",
-    Library.scalaTest % "test, it",
-    Library.scalaCheck % "test, it",
-    Library.scalaTestPlusScalaCheck % "test, it",
+    Library.playSlickEvolutions % "test",
+    Library.scalaTest % "test",
+    Library.scalaCheck % "test",
+    Library.scalaTestPlusScalaCheck % "test",
     Library.h2 % "test",
-    Library.postgres % "it",
-    Library.testcontainersScala % "it",
-    Library.testcontainersScalaPostgresql % "it"
+  )
+
+  val integration = Seq(
+    Library.playSlickEvolutions % "test",
+    Library.scalaTest % "test",
+    Library.scalaCheck % "test",
+    Library.postgres % "test",
+    Library.testcontainersScala % "test",
+    Library.testcontainersScalaPostgresql % "test",
+    Library.scalaTestPlusScalaCheck % "test",
   )
 }
 
 object Version {
-  val atlassianConnectPlay = "0.7.0"
-  val playSlick = "5.1.0"
-  val scalaTestPlusPlay = "5.1.0"
-  val scalaCheck = "1.14.3"
-  val scalaTestPlusScalaCheck = "3.1.2.0"
+  val atlassianConnectPlay = "0.8.0"
+  val playSlick = "6.1.0"
+  val scalaTestPlusPlay = "7.0.1"
+  val scalaCheck = "1.18.0"
+  val scalaTestPlusScalaCheck = "3.2.18.0"
   val h2 = "1.4.197"
   val postgres = "42.6.0"
-  val testcontainersScala = "0.41.0"
+  val testcontainersScala = "0.41.3"
 }
 
 object Library {
   val atlassianConnectApi = "io.toolsplus" %% "atlassian-connect-play-api" % Version.atlassianConnectPlay
-  val playSlick = "com.typesafe.play" %% "play-slick" % Version.playSlick
-  val playSlickEvolutions = "com.typesafe.play" %% "play-slick-evolutions" % Version.playSlick
+  val playSlick = "org.playframework" %% "play-slick" % Version.playSlick
+  val playSlickEvolutions = "org.playframework" %% "play-slick-evolutions" % Version.playSlick
   val scalaTest = "org.scalatestplus.play" %% "scalatestplus-play" % Version.scalaTestPlusPlay
   val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
-  val scalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-14" % Version.scalaTestPlusScalaCheck
+  val scalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-17" % Version.scalaTestPlusScalaCheck
   val h2 = "com.h2database" % "h2" % Version.h2
   val postgres = "org.postgresql" % "postgresql" % Version.postgres
   val testcontainersScala = "com.dimafeng" %% "testcontainers-scala-scalatest" % Version.testcontainersScala

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.3.13
+sbt.version = 1.10.0

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.4.3-SNAPSHOT"
+ThisBuild / version := "0.4.3-SNAPSHOT"