Skip to content

Commit 85a5ce2

Browse files
authored
Merge pull request #28 from UdashFramework/jquery-3.4
jQuery 3.4.1
2 parents 86bb34e + fb7f008 commit 85a5ce2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ val commonSettings = Seq(
6363
)
6464

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

87-
Compile / npmDependencies += "jquery" -> "3.3.1",
88-
jsDependencies += "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js",
89-
Test / requireJsDomEnv := true
88+
Compile / npmDependencies += "jquery" -> "3.4.1",
89+
jsDependencies += "org.webjars" % "jquery" % "3.4.1" / "3.4.1/jquery.js",
9090
)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# suppress inspection "UnusedProperty"
2-
sbt.version=1.3.8
2+
sbt.version=1.3.9

0 commit comments

Comments
 (0)