Merge pull request #6 from Dasiu/play-2-8-update

Updated Play to 2.8

build.sbt

@@ -5,7 +5,7 @@ version := "1.0"
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
 
-scalaVersion := "2.13.0"
+scalaVersion := "2.13.1"
 
 javacOptions ++= Seq("-source", "11", "-target", "11")
 
@@ -15,19 +15,19 @@ libraryDependencies ++= Seq(
   ws,
   ehcache,
   cacheApi,
-  "com.typesafe.play" %% "play-json" % "2.7.4",
-  "org.julienrf" %% "play-json-derived-codecs" % "6.0.0",
-  "com.typesafe.play" %% "play-slick" % "4.0.2",
-  "com.typesafe.play" %% "play-slick-evolutions" % "4.0.2",
+  "com.typesafe.play" %% "play-json" % "2.8.1",
+  "org.julienrf" %% "play-json-derived-codecs" % "7.0.0",
+  "com.typesafe.play" %% "play-slick" % "5.0.0",
+  "com.typesafe.play" %% "play-slick-evolutions" % "5.0.0",
   "commons-validator" % "commons-validator" % "1.6",
   "com.github.slugify" % "slugify" % "2.4",
-  "com.h2database" % "h2" % "1.4.199",
+  "com.h2database" % "h2" % "1.4.200",
   "org.mindrot" % "jbcrypt" % "0.4",
   "org.apache.commons" % "commons-lang3" % "3.9",
 
   "com.softwaremill.macwire" %% "macros" % "2.3.3" % "provided",
 
-  "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" % "test",
+  "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % "test",
 )
 
 fork in run := true

conf/evolutions/default/1.sql

@@ -71,7 +71,7 @@ CREATE TABLE follow_associations (
   followed_id INTEGER NOT NULL,
   FOREIGN KEY (follower_id) REFERENCES users(id),
   FOREIGN KEY (followed_id) REFERENCES users(id),
-  CONSTRAINT follow_associations_follower_followed_unq UNIQUE (follower_id, followed_id),
+  CONSTRAINT follow_associations_follower_followed_unq UNIQUE (follower_id, followed_id)
 );
 
 CREATE TABLE favorite_associations (
@@ -80,7 +80,7 @@ CREATE TABLE favorite_associations (
   favorited_id INTEGER NOT NULL,
   FOREIGN KEY (user_id) REFERENCES users(id),
   FOREIGN KEY (favorited_id) REFERENCES articles(id),
-  CONSTRAINT favorite_associations_user_favorited_unq UNIQUE (user_id, favorited_id),
+  CONSTRAINT favorite_associations_user_favorited_unq UNIQUE (user_id, favorited_id)
 );
 
 # --- !Downs

project/plugins.sbt

@@ -4,7 +4,7 @@
 
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.1")
 

test/commons_test/test_helpers/RealWorldWithServerAndTestConfigBaseTest.scala

@@ -42,7 +42,7 @@ object RealWorldWithServerAndTestConfigBaseTest {
     override def configuration: Configuration = {
       val testConfig = Configuration.from(TestUtils.config)
       val config = super.configuration
-      config ++ testConfig
+      testConfig.withFallback(config)
     }
 
   }