From 2f6c9feedada60cfcd7c73b18e033682c4a81f98 Mon Sep 17 00:00:00 2001 From: Pierre Kisters Date: Tue, 2 Jun 2020 15:57:07 +0200 Subject: [PATCH] 0.3.3: use normalizedName for webjar asset path --- build.sbt | 2 +- .../scala/de/lolhens/sbt/scalajs/webjar/WebjarProject.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 21d1871..29fe7b4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ lazy val commonSettings: Seq[Setting[_]] = Seq( organization := "de.lolhens", - version := "0.3.2-SNAPSHOT", + version := "0.3.3-SNAPSHOT", licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")), diff --git a/sbt-scalajs-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/WebjarProject.scala b/sbt-scalajs-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/WebjarProject.scala index bc2e501..1a128e5 100644 --- a/sbt-scalajs-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/WebjarProject.scala +++ b/sbt-scalajs-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/WebjarProject.scala @@ -18,7 +18,7 @@ class WebjarProject(val self: Project) extends AnyVal { watchSources := (self / watchSources).value, - self / Compile / webjarResourcePath := s"META-INF/resources/webjars/${(self / name).value}/${(self / version).value}", + self / Compile / webjarResourcePath := s"META-INF/resources/webjars/${(self / normalizedName).value}/${(self / version).value}", self / Compile / webjarMainResource := (self / Compile / webjarResourcePath).value + "/" + (self / Compile / webjarMainResourceName).value,