Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vmunier committed Nov 13, 2023
1 parent f82d43d commit 4684398
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sbt-web-scalajs is a SBT plugin which allows you to use Scala.js along with any

Specify the sbt version in `project/build.properties` (you can find the latest version [here](https://www.scala-sbt.org/download.html)):
```
sbt.version=1.9.6
sbt.version=1.9.7
```

Add the sbt-web-scalajs and Scala.js plugins to `project/plugins.sbt`:
Expand Down
7 changes: 4 additions & 3 deletions src/sbt-test/sbt-web-scalajs/akka-http-scalajs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ lazy val server = project.settings(
Assets / pipelineStages := Seq(scalaJSPipeline),
// triggers scalaJSPipeline when using compile or continuous compilation
Compile / compile := ((Compile / compile) dependsOn scalaJSPipeline).value,
resolvers += "Akka library repository".at("https://repo.akka.io/maven"),
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http" % "10.5.2",
"com.typesafe.akka" %% "akka-stream" % "2.8.4"
"com.typesafe.akka" %% "akka-http" % "10.6.0",
"com.typesafe.akka" %% "akka-stream" % "2.9.0"
),
Assets / WebKeys.packagePrefix := "public/",
Runtime / managedClasspath += (Assets / packageBin).value
Expand All @@ -23,7 +24,7 @@ lazy val server = project.settings(

lazy val firstClient = project.settings(
scalaJSUseMainModuleInitializer := true,
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.6.0",
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0",
jsDependencies += "org.webjars" % "jquery" % "2.1.4" / "2.1.4/jquery.js",
Compile / fastLinkJS / jsMappings += toPathMapping((Compile / packageJSDependencies).value),
Compile / fullLinkJS / jsMappings += toPathMapping((Compile / packageMinifiedJSDependencies).value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sys.props.get("plugin.version") match {
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
}

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-web-scalajs/play-scalajs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ lazy val server = project.settings(
lazy val client = project.settings(
scalaJSUseMainModuleInitializer := true,
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "2.6.0"
"org.scala-js" %%% "scalajs-dom" % "2.8.0"
)
).enablePlugins(ScalaJSPlugin, ScalaJSWeb)
.dependsOn(sharedJs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ sys.props.get("plugin.version") match {
}

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.20")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.0")

0 comments on commit 4684398

Please sign in to comment.