Skip to content

Commit

Permalink
play 2.3.0 final
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Jun 2, 2014
1 parent 3544748 commit 01189a3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ language: scala
jdk:
- oraclejdk7

script:
- sbt "$TEST_SCRIPT"

env:
- TEST_SCRIPT=";++2.10.4; root/test"
- TEST_SCRIPT=";++2.11.0; core/test; test/test"
scala:
- 2.10.4
- 2.11.1

7 changes: 2 additions & 5 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,8 @@ object ApplicationBuild extends Build {
libraryDependencies += play.Play.autoImport.jdbc,
libraryDependencies += "org.mindrot" % "jbcrypt" % "0.3m",
libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-test" % "2.0.0" % "test",
// TODO scalikejdbc-play-plugin for Scala2.11, play2.3
// https://github.com/scalikejdbc/scalikejdbc-play-support/issues/4
libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-plugin" % "2.2.0",
// TODO https://github.com/tototoshi/play-flyway/pull/12
libraryDependencies += "com.github.tototoshi" %% "play-flyway" % "1.0.5-SNAPSHOT",
libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-plugin" % "2.3.0",
libraryDependencies += "com.github.tototoshi" %% "play-flyway" % "1.1.0",
TwirlKeys.templateImports in Compile += "jp.t2v.lab.play2.auth.sample._",
publishLocal := {},
publish := {}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.5-RC3
sbt.version=0.13.5
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// The Typesafe repository
// The Typesafe repository
resolvers ++= Seq(
"Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
)

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0-RC1")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0")

scalacOptions ++= Seq("-deprecation", "-unchecked", "-language:_")
scalacOptions ++= Seq("-deprecation", "-unchecked", "-language:_")

0 comments on commit 01189a3

Please sign in to comment.