Fix web jars version

Tangoy · Dec 15, 2015 · bb8841f · bb8841f
1 parent b070255
commit bb8841f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 91 deletions.
diff --git a/app/controllers/KMWebJarAssets.scala b/app/controllers/KMWebJarAssets.scala
diff --git a/app/loader/KafkaManagerLoader.scala b/app/loader/KafkaManagerLoader.scala
@@ -32,7 +32,7 @@ class ApplicationComponents(context: Context) extends BuiltInComponentsFromConte
   private[this] lazy val reassignPartitionsC = new controllers.ReassignPartitions(messagesApi, kafkaManagerContext)
   private[this] lazy val kafkaStateCheckC = new controllers.api.KafkaStateCheck(messagesApi, kafkaManagerContext)
   private[this] lazy val assetsC = new controllers.Assets(httpErrorHandler)
-  private[this] lazy val webJarsAssetsC = new controllers.KMWebJarAssets(httpErrorHandler, context.initialConfiguration)
+  private[this] lazy val webJarsAssetsC = new controllers.WebJarAssets(httpErrorHandler, context.initialConfiguration, context.environment)
 
   override val router: Router = new Routes(
     httpErrorHandler, 

diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -9,15 +9,15 @@
 <head>
     <title>@title</title>
     <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")">
-    <link rel='stylesheet' href='@routes.KMWebJarAssets.at(KMWebJarAssets.locate("css/bootstrap.min.css"))'>
+    <link rel='stylesheet' href='@routes.WebJarAssets.at(WebJarAssets.locate("css/bootstrap.min.css"))'>
     <script>
-        @Html(org.webjars.RequireJS.getSetupJavaScript(routes.KMWebJarAssets.at("").url))
+        @Html(org.webjars.RequireJS.getSetupJavaScript(routes.WebJarAssets.at("").url))
     </script>
     <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/index.min.css")">
     <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("dataTables/stylesheets/dataTables.bootstrap.css")">
     <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("chartist/stylesheets/chartist.min.css")">
     <!--
-    <script data-main="@routes.Assets.versioned("javascripts/index.js")" src="@routes.KMWebJarAssets.at(KMWebJarAssets.locate("require.min.js"))"></script>
+    <script data-main="@routes.Assets.versioned("javascripts/index.js")" src="@routes.WebJarAssets.at(WebJarAssets.locate("require.min.js"))"></script>
     -->
     <script src="@routes.Assets.versioned("chartist/javascripts/chartist.min.js")"></script>
 </head>
@@ -30,8 +30,8 @@
 @content
 </div>
 
-<script src="@routes.KMWebJarAssets.at(KMWebJarAssets.locate("jquery.min.js"))"></script>
-<script src="@routes.KMWebJarAssets.at(KMWebJarAssets.locate("js/bootstrap.min.js"))"></script>
+<script src="@routes.WebJarAssets.at(WebJarAssets.locate("jquery.min.js"))"></script>
+<script src="@routes.WebJarAssets.at(WebJarAssets.locate("js/bootstrap.min.js"))"></script>
 <script src="@routes.Assets.versioned("dataTables/javascripts/jquery.dataTables.min.js")"></script>
 <script src="@routes.Assets.versioned("dataTables/javascripts/dataTables.bootstrap.js")"></script>
 

diff --git a/build.sbt b/build.sbt
@@ -22,7 +22,7 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-actor" % "2.3.14",
   "com.typesafe.akka" %% "akka-slf4j" % "2.3.14",
   "com.google.code.findbugs" % "jsr305" % "2.0.1",
-  "org.webjars" %% "webjars-play" % "2.4.0",
+  "org.webjars" %% "webjars-play" % "2.4.0-2",
   "org.webjars" % "bootstrap" % "3.3.5",
   "org.webjars" % "jquery" % "2.1.4",
   "org.webjars" % "backbonejs" % "1.2.3",

diff --git a/conf/routes b/conf/routes
@@ -63,4 +63,4 @@ GET         /vassets/*file          controllers.Assets.versioned(path="/public",
 GET         /assets/*file           controllers.Assets.at(path="/public", file)
 
 # WebJars
-GET         /webjars/*file          controllers.KMWebJarAssets.at(file)
+GET         /webjars/*file          controllers.WebJarAssets.at(file)