fixed tests

lhns · Sep 6, 2021 · ba773a4 · ba773a4
1 parent 9bee01b
commit ba773a4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -9,26 +9,27 @@ Allows you to build [WebJars](https://www.webjars.org/) from [Scala.js](https://
 
 ### plugins.sbt
 ```sbt
-addSbtPlugin("de.lolhens" % "sbt-scalajs-webjar" % "0.3.5")
+addSbtPlugin("de.lolhens" % "sbt-scalajs-webjar" % "0.4.0")
 ```
 
 Example
 -------
+
 ```scala
 lazy val shared = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure).in(file("shared"))
 
 lazy val sharedJs = shared.js
 lazy val sharedJvm = shared.jvm
 
-lazy val server = project.in(file("server"))
-  .dependsOn(sharedJvm)
-  .dependsOn(clientWebjar)
-
-lazy val client = project.in(file("client"))
+lazy val frontend = project.in(file("client"))
   .enablePlugins(ScalaJSWebjarPlugin)
   .dependsOn(sharedJs)
 
-lazy val clientWebjar = client.webjar
+lazy val frontendWebjar = frontend.webjar
+
+lazy val server = project.in(file("server"))
+  .dependsOn(sharedJvm)
+  .dependsOn(frontendWebjar)
 ```
 
 Licensing

diff --git a/sbt-scalajs-bundler-webjar/src/sbt-test/sbt-scalajs-bundler-webjar/simple/build.sbt b/sbt-scalajs-bundler-webjar/src/sbt-test/sbt-scalajs-bundler-webjar/simple/build.sbt
@@ -1,7 +1,7 @@
 lazy val root = project.in(file(".")).settings(
   scalaVersion := "2.13.1"
 )
-  .aggregate(backend, frontend.webjar)
+  .aggregate(backend, frontendWebjar)
 
 lazy val frontend = project
   .enablePlugins(
@@ -26,6 +26,8 @@ lazy val frontend = project
     }
   )
 
+lazy val frontendWebjar = frontend.webjar
+
 lazy val backend = project
   .settings(
     name := "backend",
@@ -38,4 +40,4 @@ lazy val backend = project
       (Compile / compile).value
     }
   )
-  .dependsOn(frontend.webjar)
+  .dependsOn(frontendWebjar)
diff --git a/sbt-scalajs-webjar/src/sbt-test/sbt-scalajs-webjar/simple/build.sbt b/sbt-scalajs-webjar/src/sbt-test/sbt-scalajs-webjar/simple/build.sbt
@@ -1,7 +1,7 @@
 lazy val root = project.in(file(".")).settings(
   scalaVersion := "2.13.1"
 )
-  .aggregate(backend, frontend.webjar)
+  .aggregate(backend, frontendWebjar)
 
 lazy val frontend = project
   .enablePlugins(
@@ -15,6 +15,8 @@ lazy val frontend = project
     scalaJSUseMainModuleInitializer := true
   )
 
+lazy val frontendWebjar = frontend.webjar
+
 lazy val backend = project
   .settings(
     name := "backend",
@@ -27,4 +29,4 @@ lazy val backend = project
       (Compile / compile).value
     }
   )
-  .dependsOn(frontend.webjar)
+  .dependsOn(frontendWebjar)