Commit 2fbae57
Richard Nguyen
Upgrade play to 2.4.0
1 parent 1a3bc4c commit 2fbae57
4 files changed
Lines changed: 13 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,6 +17,7 @@ object Dependencies { | |||
| 17 | 17 | val contentApiClient = "com.gu" %% "content-api-client" % "6.6" | |
| 18 | 18 | val dfpAxis = "com.google.api-ads" % "dfp-axis" % "2.0.0" | |
| 19 | 19 | val dispatch = "net.databinder.dispatch" %% "dispatch-core" % "0.11.3" | |
| 20 | + val dispatchTest = "net.databinder.dispatch" %% "dispatch-core" % "0.11.3" % Test | ||
| 20 | 21 | val exactTargetClient = "com.gu" %% "exact-target-client" % "2.24" | |
| 21 | 22 | val faciaFapiScalaClient = "com.gu" %% "fapi-client" % "0.51" | |
| 22 | 23 | val faciaScalaClient = "com.gu" %% "facia-json" % "0.51" | |
@@ -57,4 +58,5 @@ object Dependencies { | |||
| 57 | 58 | val snappyJava = "org.xerial.snappy" % "snappy-java" % "1.0.5.1" | |
| 58 | 59 | val uaDetectorResources = "net.sf.uadetector" % "uadetector-resources" % "2013.04" | |
| 59 | 60 | val scalaTestPlus = "org.scalatestplus" %% "play" % "1.2.0" % "test" | |
| 61 | + val anormModule = "com.typesafe.play" %% "anorm" % "2.4.0" | ||
| 60 | 62 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,6 +5,8 @@ import sbt.Keys._ | |||
| 5 | 5 | import play.Play.autoImport._ | |
| 6 | 6 | import PlayKeys._ | |
| 7 | 7 | import play._ | |
| 8 | + import play.sbt._ | ||
| 9 | + import play.sbt.routes.RoutesKeys | ||
| 8 | 10 | import play.twirl.sbt.Import._ | |
| 9 | 11 | import com.typesafe.sbt.web.Import._ | |
| 10 | 12 | import Dependencies._ | |
@@ -39,7 +41,8 @@ object Frontend extends Build with Prototypes { | |||
| 39 | 41 | shadeMemcached, | |
| 40 | 42 | snappyJava, | |
| 41 | 43 | ws, | |
| 42 | - faciaFapiScalaClient | ||
| 44 | + faciaFapiScalaClient, | ||
| 45 | + dispatchTest | ||
| 43 | 46 | ) | |
| 44 | 47 | ).settings( | |
| 45 | 48 | mappings in TestAssets ~= filterAssets | |
@@ -98,11 +101,11 @@ object Frontend extends Build with Prototypes { | |||
| 98 | 101 | postgres, | |
| 99 | 102 | paClient, | |
| 100 | 103 | dfpAxis, | |
| 101 | - anorm, | ||
| 104 | + anormModule, | ||
| 102 | 105 | jdbc | |
| 103 | 106 | ), | |
| 104 | - routesImport += "bindables._", | ||
| 105 | - routesImport += "org.joda.time.LocalDate" | ||
| 107 | + RoutesKeys.routesImport += "bindables._", | ||
| 108 | + RoutesKeys.routesImport += "org.joda.time.LocalDate" | ||
| 106 | 109 | ) | |
| 107 | 110 | ||
| 108 | 111 | val faciaTool = application("facia-tool").dependsOn(commonWithTests).aggregate(common).settings( | |
@@ -171,11 +174,11 @@ object Frontend extends Build with Prototypes { | |||
| 171 | 174 | ) | |
| 172 | 175 | ||
| 173 | 176 | val preview = application("preview").dependsOn(withTests(common), standalone).settings( | |
| 174 | - routesImport += "scala.language.reflectiveCalls" | ||
| 177 | + RoutesKeys.routesImport += "scala.language.reflectiveCalls" | ||
| 175 | 178 | ) | |
| 176 | 179 | ||
| 177 | 180 | val trainingPreview = application("training-preview").dependsOn(withTests(common), standalone).settings( | |
| 178 | - routesImport += "scala.language.reflectiveCalls" | ||
| 181 | + RoutesKeys.routesImport += "scala.language.reflectiveCalls" | ||
| 179 | 182 | ) | |
| 180 | 183 | ||
| 181 | 184 | val integrationTests = Project("integrated-tests", file("integrated-tests")) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1 +1 @@ | |||
| 1 | - sbt.version=0.13.7 | ||
| 1 | + sbt.version=0.13.8 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,7 @@ resolvers ++= Seq( | |||
| 8 | 8 | Resolver.url("sbt-plugin-snapshots", new URL("http://repo.scala-sbt.org/scalasbt/sbt-plugin-snapshots/"))(Resolver.ivyStylePatterns) | |
| 9 | 9 | ) | |
| 10 | 10 | ||
| 11 | - addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7") | ||
| 11 | + addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0") | ||
| 12 | 12 | ||
| 13 | 13 | addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.6") | |
| 14 | 14 | ||
0 commit comments