Skip to content

Commit b31c4cc

Browse files
committed
bump Play version to 2.3.1
In addition * extend .gitignore * fix minor typing error in GoogleLoginSpec
1 parent d7c73b4 commit b31c4cc

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.DS_Store
33
*.ser
44
*.pyc
5+
*.swp
56

67
# Files related to Play build or usage
78
target
@@ -10,6 +11,7 @@ logs
1011
# IDE and editors
1112
*~
1213
.idea
14+
.cache
1315
nbproject
1416
eclipse
1517
.amateras

module-code/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin

module-code/test/scenarios/GoogleLoginSpec.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ class GoogleLoginSpec extends PlaySpecification with Mockito {
6262
redirectLocation(authenticateResponse)=== Some("/")
6363
}
6464
}
65+
66+
import scala.collection.immutable.ListMap
6567

6668
class TestEnvironment( _routes: => RoutesService = new RoutesService.Default(),
6769
_userService: =>UserService[DemoUser] = new TestUserService(),
@@ -72,7 +74,7 @@ class GoogleLoginSpec extends PlaySpecification with Mockito {
7274
override lazy val userService: UserService[DemoUser] = _userService
7375
override lazy val eventListeners: List[EventListener[DemoUser]] = _eventListeners
7476
override lazy val httpService : HttpService = _httpService
75-
override lazy val providers: Map[String, IdentityProvider] = Map(include(new GoogleProvider(routes, cacheService, oauth2ClientFor(GoogleProvider.Google))))
77+
override lazy val providers: ListMap[String, IdentityProvider] = ListMap(include(new GoogleProvider(routes, cacheService, oauth2ClientFor(GoogleProvider.Google))))
7678
}
7779
val googleConfig = Map(
7880
"smtp.mock"->true

project/Common.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import Keys._
33

44
object Common {
55
def version = "master-SNAPSHOT"
6-
def playVersion = System.getProperty("play.version", "2.3.0")
6+
def playVersion = System.getProperty("play.version", "2.3.1")
77
def scalaVersion = System.getProperty("scala.version", "2.11.1")
88
}

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolvers += "Typesafe repository" at
66
"http://repo.typesafe.com/typesafe/releases/"
77

88
// Use the Play sbt plugin for Play projects
9-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0")
9+
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.1")
1010

1111
// PGP signing
1212
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")

0 commit comments

Comments
 (0)