Merge pull request #368 from akkie/master

Release version 3.0.0-RC1
mohiva · Jun 3, 2015 · ae82b22 · ae82b22
2 parents ead4231 + cc4ffcf
commit ae82b22
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
-## 3.0
+## 3.0 (2015-06-03)
 
 - Update to Play 2.4
-- Fix a lot of inconsistencies in the API
+- A lot of API enhancements
 
 ## 2.0 (2015-03-28)
 

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

diff --git a/silhouette/app/com/mohiva/play/silhouette/api/Environment.scala b/silhouette/app/com/mohiva/play/silhouette/api/Environment.scala
@@ -22,8 +22,11 @@ import scala.concurrent.ExecutionContext
 
 /**
  * The environment needed to instantiate a Silhouette controller.
+ *
+ * @tparam I The type of the identity.
+ * @tparam A The type of the authenticator.
  */
-trait Environment[I <: Identity, T <: Authenticator] extends ExecutionContextProvider {
+trait Environment[I <: Identity, A <: Authenticator] extends ExecutionContextProvider {
 
   /**
    * Gets the identity service implementation.
@@ -37,7 +40,7 @@ trait Environment[I <: Identity, T <: Authenticator] extends ExecutionContextPro
    *
    * @return The authenticator service implementation.
    */
-  def authenticatorService: AuthenticatorService[T]
+  def authenticatorService: AuthenticatorService[A]
 
   /**
    * Gets the list of request providers.
@@ -58,11 +61,11 @@ trait Environment[I <: Identity, T <: Authenticator] extends ExecutionContextPro
  * The companion object.
  */
 object Environment {
-  def apply[I <: Identity, T <: Authenticator](
+  def apply[I <: Identity, A <: Authenticator](
     identityServiceImpl: IdentityService[I],
-    authenticatorServiceImpl: AuthenticatorService[T],
+    authenticatorServiceImpl: AuthenticatorService[A],
     requestProvidersImpl: Seq[RequestProvider],
-    eventBusImpl: EventBus)(implicit ec: ExecutionContext) = new Environment[I, T] {
+    eventBusImpl: EventBus)(implicit ec: ExecutionContext) = new Environment[I, A] {
     val identityService = identityServiceImpl
     val authenticatorService = authenticatorServiceImpl
     val requestProviders = requestProvidersImpl