Skip to content

Commit

Permalink
bump sbt and fix deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesward committed Sep 16, 2024
1 parent b7fad6b commit 175dc42
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2
4 changes: 2 additions & 2 deletions src/main/scala/org/webjars/play/WebJarAssets.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/webjars/play/WebJarComponents.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)

}

0 comments on commit 175dc42

Please sign in to comment.