diff --git a/project/build.properties b/project/build.properties index ee4c672..0b699c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/src/main/scala/org/webjars/play/WebJarAssets.scala b/src/main/scala/org/webjars/play/WebJarAssets.scala index 934fb2d..647963a 100644 --- a/src/main/scala/org/webjars/play/WebJarAssets.scala +++ b/src/main/scala/org/webjars/play/WebJarAssets.scala @@ -2,14 +2,14 @@ package org.webjars.play import javax.inject.Inject - import controllers.AssetsMetadata import org.webjars.WebJarAssetLocator +import play.api.Environment import play.api.http.HttpErrorHandler import play.api.mvc.{Action, AnyContent} // this is needed to avoid conflicts with the controllers.Assets controller -class WebJarAssets @Inject() (errorHandler: HttpErrorHandler, assetsMetadata: AssetsMetadata) extends controllers.AssetsBuilder(errorHandler, assetsMetadata) { +class WebJarAssets @Inject() (errorHandler: HttpErrorHandler, assetsMetadata: AssetsMetadata, env: Environment) extends controllers.AssetsBuilder(errorHandler, assetsMetadata, env) { override def at(file: String): Action[AnyContent] = { at("/" + WebJarAssetLocator.WEBJARS_PATH_PREFIX, file) diff --git a/src/main/scala/org/webjars/play/WebJarComponents.scala b/src/main/scala/org/webjars/play/WebJarComponents.scala index f84b1ba..7ad0f20 100644 --- a/src/main/scala/org/webjars/play/WebJarComponents.scala +++ b/src/main/scala/org/webjars/play/WebJarComponents.scala @@ -16,6 +16,6 @@ trait WebJarComponents { lazy val webJarsUtil = new WebJarsUtil(configuration, environment) - lazy val webJarAssets = new WebJarAssets(httpErrorHandler, assetsMetadata) + lazy val webJarAssets = new WebJarAssets(httpErrorHandler, assetsMetadata, environment) }