Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
jQuery 3.4.1
  • Loading branch information
ddworak committed Apr 10, 2020
commit fb7f0089dc26ad059b00e4b758c5e175c4948d4e
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ val commonSettings = Seq(
)

val commonJSSettings = Seq(
Test / parallelExecution := false,
Test / scalaJSStage := FastOptStage,
Test / requireJsDomEnv := true,
npmExtraArgs += "--silent",
scalacOptions += {
val localDir = (ThisBuild / baseDirectory).value.toURI.toString
val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery"
Expand All @@ -84,7 +85,6 @@ lazy val root = project.in(file("."))
"com.lihaoyi" %%% "scalatags" % "0.8.6" % Test
),

Compile / npmDependencies += "jquery" -> "3.3.1",
jsDependencies += "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js",
Test / requireJsDomEnv := true
Compile / npmDependencies += "jquery" -> "3.4.1",
jsDependencies += "org.webjars" % "jquery" % "3.4.1" / "3.4.1/jquery.js",
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.3.8
sbt.version=1.3.9