Merge pull request #28 from huntc/play24-rc1

Play 2.4-RC1 changes
typesafehub · Apr 30, 2015 · 1b43820 · 1b43820
2 parents 9135a8a + 1f0510f
commit 1b43820
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 46 deletions.
diff --git a/app/modules/ConductRModule.scala → app/modules/ConductRDocRendererModule.scala b/app/modules/ConductRModule.scala → app/modules/ConductRDocRendererModule.scala
@@ -10,7 +10,7 @@ import play.api.{Configuration, Environment}
 import play.api.inject.Module
 import play.api.libs.ws.WSClient
 
-object ConductRModule {
+object ConductRDocRendererModule {
 
   @Singleton
   class ConductRDocRendererProvider @Inject()(actorSystem: ActorSystem, wsClient: WSClient)
@@ -28,8 +28,8 @@ object ConductRModule {
   }
 }
 
-class ConductRModule extends Module {
-  import ConductRModule._
+class ConductRDocRendererModule extends Module {
+  import ConductRDocRendererModule._
 
   def bindings(environment: Environment,
                configuration: Configuration) = Seq(

diff --git a/app/modules/CustomApplicationLoader.scala b/app/modules/CustomApplicationLoader.scala
diff --git a/app/plugins/ConductrPlugin.scala b/app/plugins/ConductrPlugin.scala
diff --git a/build.sbt b/build.sbt
@@ -9,17 +9,17 @@ scalaVersion := "2.11.6"
 resolvers ++= Seq(
   "spray repo"          at "http://repo.spray.io",
   "patriknw at bintray" at "http://dl.bintray.com/patriknw/maven",
-  "typesafe-releases"   at "http://repo.typesafe.com/typesafe/maven-releases"
+  "typesafe-releases"   at "http://repo.typesafe.com/typesafe/maven-releases",
+  Resolver.bintrayRepo("typesafe", "maven-releases")
 )
 
 libraryDependencies ++= Seq(
   "com.github.patriknw"   %% "akka-data-replication"      % "0.11",
-  "com.typesafe.conductr" %% "akka-conductr-bundle-lib"	  % "0.8.0",
   "org.apache.commons"    %  "commons-compress" 		      % "1.8.1",
   "commons-io"            %  "commons-io"       		      % "2.4",
   "org.webjars"           %  "foundation"       	     	  % "5.5.1",
   "com.googlecode.kiama"  %% "kiama"            		      % "1.8.0",
-  "com.typesafe.conductr" %% "play24-conductr-bundle-lib"	% "0.10.0",
+  "com.typesafe.conductr" %% "play24-conductr-bundle-lib"	% "0.13.0",
   "com.typesafe.play"     %% "play-doc"         		      % "1.1.0",
   "io.spray"              %% "spray-caching"    		      % "1.3.3",
   "org.scalatest"         %% "scalatest"        		      % "2.2.4" % "test",

diff --git a/conf/application.conf b/conf/application.conf
@@ -35,5 +35,8 @@ app.host-aliases = {
 # Render cluster configuration
 akka.actor.provider = akka.cluster.ClusterActorRefProvider
 
-play.application.loader = "modules.CustomApplicationLoader"
-play.modules.enabled += "modules.ConductRModule"
+play.application.loader = "com.typesafe.conductr.bundlelib.play.ConductRApplicationLoader"
+
+play.modules.enabled += "com.typesafe.conductr.bundlelib.play.ConductRLifecycleModule"
+
+play.modules.enabled += "modules.ConductRDocRendererModule"
diff --git a/conf/play.plugins b/conf/play.plugins
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ resolvers ++= Seq(
 )
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0-M3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0-RC1")
 
 // web plugins
 
@@ -23,4 +23,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % "1.0.1")
 addSbtPlugin("default" % "sbt-sass" % "0.1.9")
 
 // conductR
-addSbtPlugin("com.typesafe.conductr" % "sbt-conductr" % "0.30.0")
+addSbtPlugin("com.typesafe.conductr" % "sbt-conductr" % "0.34.0")