Merge pull request #168 from t2v/feature/bump_stackable_controller

Bumped stackable-controller
t2v · Mar 8, 2016 · 80a9458 · 80a9458
2 parents 2dd6944 + 16e95af
commit 80a9458
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -9,9 +9,9 @@ object ApplicationBuild extends Build {
  val playVersion = play.core.PlayVersion.current
 
  lazy val baseSettings = Seq(
- version := "0.14.1",
- scalaVersion := "2.11.6",
- crossScalaVersions := Seq("2.10.5", "2.11.6"),
+ version := "0.14.2-SNAPSHOT",
+ scalaVersion := "2.11.7",
+ crossScalaVersions := Seq("2.10.5", "2.11.7"),
  organization := "jp.t2v",
  resolvers ++=
  Resolver.typesafeRepo("releases") ::
@@ -58,7 +58,7 @@ object ApplicationBuild extends Build {
  baseSettings,
  libraryDependencies += "com.typesafe.play" %% "play" % playVersion % "provided",
  libraryDependencies += "com.typesafe.play" %% "play-cache" % playVersion % "provided",
- libraryDependencies += "jp.t2v" %% "stackable-controller" % "0.5.0",
+ libraryDependencies += "jp.t2v" %% "stackable-controller" % "0.5.1",
  name := appName,
  publishMavenStyle := appPublishMavenStyle,
  publishArtifact in Test := appPublishArtifactInTest,

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.11
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,7 +5,7 @@ resolvers ++= Seq(
 )
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6")
 
 scalacOptions ++= Seq("-deprecation", "-unchecked", "-language:_")