Skip to content

Commit a31effd

Browse files
committed
Merge pull request #84 from tsuyoshizawa/play-2.5
support Play 2.5
2 parents 2b6c127 + 4a1a05e commit a31effd

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: scala
22
scala:
3-
- 2.10.5
4-
- 2.11.6
3+
- 2.11.7
54
jdk:
65
- oraclejdk8
76
notifications:

project/Build.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ object ScalaOAuth2Build extends Build {
66

77
lazy val _organization = "com.nulab-inc"
88
lazy val _version = "0.16.2-SNAPSHOT"
9-
lazy val _playVersion = "2.4.6"
9+
lazy val _playVersion = "2.5.0"
1010

11-
val _scalaVersion = "2.10.5"
12-
val _crossScalaVersions = Seq("2.10.5", "2.11.7")
11+
val _scalaVersion = "2.11.7"
12+
val _crossScalaVersions = Seq("2.11.7")
1313

1414
val commonDependenciesInTestScope = Seq(
1515
"org.scalatest" %% "scalatest" % "2.2.4" % "test"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.8
1+
sbt.version=0.13.11

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
1+
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

0 commit comments

Comments
 (0)