From e899224bff3e6e483a610e0e9dfa0ec876abd17b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 5 Jan 2022 21:10:29 +0100 Subject: [PATCH 1/2] @deprecated annotation needs to be constant Otherwise scaladoc will complain in Scala 2.13.6 See https://github.com/scala/scala/pull/9336 (cherry picked from commit 27a7f83b48d9b5df92044a041bed1db252860795) --- .../main/scala/play/api/db/slick/DatabaseConfigProvider.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala b/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala index ce455ad9..c9e3a890 100644 --- a/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala +++ b/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala @@ -92,7 +92,7 @@ object DatabaseConfigProvider { */ @throws(classOf[IllegalArgumentException]) @deprecated( - "Use DatabaseConfigProvider#get[P] or SlickApi#dbConfig[P](\"default\") on injected instances".stripMargin, + "Use DatabaseConfigProvider#get[P] or SlickApi#dbConfig[P](\"default\") on injected instances", "3.0.0" ) def get[P <: BasicProfile](implicit app: Application): DatabaseConfig[P] = From 17489ef9225c221c276d31a97ed8ff5dc13480f2 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 6 Jan 2022 00:31:01 +0100 Subject: [PATCH 2/2] Formatting --- .../scala/play/api/db/slick/DatabaseConfigProvider.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala b/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala index c9e3a890..283b2a56 100644 --- a/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala +++ b/src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala @@ -91,10 +91,7 @@ object DatabaseConfigProvider { * @return a Slick `DatabaseConfig` instance for the `default` database. */ @throws(classOf[IllegalArgumentException]) - @deprecated( - "Use DatabaseConfigProvider#get[P] or SlickApi#dbConfig[P](\"default\") on injected instances", - "3.0.0" - ) + @deprecated("Use DatabaseConfigProvider#get[P] or SlickApi#dbConfig[P](\"default\") on injected instances", "3.0.0") def get[P <: BasicProfile](implicit app: Application): DatabaseConfig[P] = DatabaseConfigLocator(app)