Merge 561575b into f4a57cb

mohiva · Sep 22, 2018 · 2c7ff74 · 2c7ff74
2 parents f4a57cb + 561575b
commit 2c7ff74
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Silhouette 
 ==========
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mohiva/play-silhouette_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.mohiva/play-silhouette_2.11) [![Build Status](https://travis-ci.org/mohiva/play-silhouette.png)](https://travis-ci.org/mohiva/play-silhouette) [![Coverage Status](https://coveralls.io/repos/mohiva/play-silhouette/badge.svg?branch=master&service=github)](https://coveralls.io/github/mohiva/play-silhouette?branch=master) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mohiva/play-silhouette?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mohiva/play-silhouette_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.mohiva/play-silhouette_2.12) [![Build Status](https://travis-ci.org/mohiva/play-silhouette.png)](https://travis-ci.org/mohiva/play-silhouette) [![Coverage Status](https://coveralls.io/repos/mohiva/play-silhouette/badge.svg?branch=master&service=github)](https://coveralls.io/github/mohiva/play-silhouette?branch=master) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mohiva/play-silhouette?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![OpenCollective](https://opencollective.com/silhouette/backers/badge.svg)](#backers) 
 [![OpenCollective](https://opencollective.com/silhouette/sponsors/badge.svg)](#sponsors)
 

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -31,7 +31,7 @@ object BasicSettings extends AutoPlugin {
 
   override def projectSettings = Seq(
     organization := "com.mohiva",
-    version := "5.0.5",
+    version := "5.0.6",
     resolvers ++= Dependencies.resolvers,
     scalaVersion := Dependencies.Versions.scalaVersion,
     crossScalaVersions := Dependencies.Versions.crossScala,

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,7 +18,7 @@ import sbt._
 object Dependencies {
 
   object Versions {
-    val crossScala = Seq("2.12.4", "2.11.12")
+    val crossScala = Seq("2.12.6", "2.11.12")
     val scalaVersion = crossScala.head
   }
 
@@ -35,7 +35,7 @@ object Dependencies {
       val test = "com.typesafe.play" %% "play-test" % version
       val specs2 = "com.typesafe.play" %% "play-specs2" % version
       val openid = "com.typesafe.play" %% "play-openid" % version
-      val jsonJoda = "com.typesafe.play" %% "play-json-joda" % "2.6.6"
+      val jsonJoda = "com.typesafe.play" %% "play-json-joda" % "2.6.10"
       object Specs2 {
         private val version = "3.8.9"
         val matcherExtra = "org.specs2" %% "specs2-matcher-extra" % version
@@ -51,9 +51,9 @@ object Dependencies {
     }
 
     val jbcrypt = "de.svenkubiak" % "jBCrypt" % "0.4.1"
-    val jwtCore = "com.atlassian.jwt" % "jwt-core" % "2.0.1"
-    val jwtApi = "com.atlassian.jwt" % "jwt-api" % "2.0.1"
-    val scalaGuice = "net.codingwell" %% "scala-guice" % "4.1.0"
+    val jwtCore = "com.atlassian.jwt" % "jwt-core" % "2.0.2"
+    val jwtApi = "com.atlassian.jwt" % "jwt-api" % "2.0.2"
+    val scalaGuice = "net.codingwell" %% "scala-guice" % "4.2.1"
     val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.5.4"
     val casClient = "org.jasig.cas.client" % "cas-client-core" % "3.4.1"
     val casClientSupportSAML = "org.jasig.cas.client" % "cas-client-support-saml" % "3.4.1"

diff --git a/project/build-jvm-opts b/project/build-jvm-opts
@@ -3,4 +3,3 @@
 -Xms2048M
 -Xmx2048M
 -Xss6M
--XX:MaxPermSize=512M
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 // Comment to get more information during initialization
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.13")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.19")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
 

diff --git a/...com/mohiva/play/silhouette/persistence/repositories/DelegableAuthInfoRepositorySpec.scala b/...com/mohiva/play/silhouette/persistence/repositories/DelegableAuthInfoRepositorySpec.scala
@@ -254,7 +254,7 @@ class DelegableAuthInfoRepositorySpec(implicit ev: ExecutionEnv)
       /**
        * Configures the module.
        */
-      def configure() {
+      override def configure() {
         bind[DelegableAuthInfoDAO[PasswordInfo]].toInstance(passwordInfoDAO)
         bind[DelegableAuthInfoDAO[OAuth1Info]].toInstance(oauth1InfoDAO)
         bind[DelegableAuthInfoDAO[OAuth2Info]].toInstance(oauth2InfoDAO)

diff --git a/silhouette-testkit/test/com/mohiva/play/silhouette/test/FakesSpec.scala b/silhouette-testkit/test/com/mohiva/play/silhouette/test/FakesSpec.scala
@@ -294,7 +294,7 @@ class FakesSpec extends PlaySpecification with JsonMatchers {
      * The guice module.
      */
     class GuiceModule extends ScalaModule {
-      def configure(): Unit = {
+      override def configure(): Unit = {
         bind[Silhouette[CookieEnv]].to[SilhouetteProvider[CookieEnv]]
         bind[Environment[CookieEnv]].toInstance(env)
         bind[SecuredController]

diff --git a/silhouette/test/com/mohiva/play/silhouette/api/actions/SecuredActionSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/actions/SecuredActionSpec.scala
@@ -540,7 +540,7 @@ class SecuredActionSpec extends PlaySpecification with Mockito with JsonMatchers
      * The guice module.
      */
     class GuiceModule extends ScalaModule {
-      def configure(): Unit = {
+      override def configure(): Unit = {
         bind[Environment[SecuredEnv]].toInstance(env)
         bind[Authorization[SecuredEnv#I, SecuredEnv#A]].toInstance(authorization)
         bind[Silhouette[SecuredEnv]].to[SilhouetteProvider[SecuredEnv]]

diff --git a/silhouette/test/com/mohiva/play/silhouette/api/actions/UnsecuredActionSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/actions/UnsecuredActionSpec.scala
@@ -194,7 +194,7 @@ class UnsecuredActionSpec extends PlaySpecification with Mockito with JsonMatche
      * The guice module.
      */
     class GuiceModule extends ScalaModule {
-      def configure(): Unit = {
+      override def configure(): Unit = {
         bind[Environment[UnsecuredEnv]].toInstance(env)
         bind[Silhouette[UnsecuredEnv]].to[SilhouetteProvider[UnsecuredEnv]]
         bind[UnsecuredController]

diff --git a/silhouette/test/com/mohiva/play/silhouette/api/actions/UserAwareActionSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/actions/UserAwareActionSpec.scala
@@ -310,7 +310,7 @@ class UserAwareActionSpec extends PlaySpecification with Mockito with JsonMatche
      * The guice module.
      */
     class GuiceModule extends ScalaModule {
-      def configure(): Unit = {
+      override def configure(): Unit = {
         bind[Silhouette[UserAwareEnv]].to[SilhouetteProvider[UserAwareEnv]]
         bind[Environment[UserAwareEnv]].toInstance(env)
         bind[UserAwareController]