From fb7f0089dc26ad059b00e4b758c5e175c4948d4e Mon Sep 17 00:00:00 2001 From: ddworak Date: Fri, 10 Apr 2020 15:22:25 +0200 Subject: [PATCH] jQuery 3.4.1 --- build.sbt | 8 ++++---- project/build.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 1addc24..8482c85 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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", ) diff --git a/project/build.properties b/project/build.properties index c9c5a37..ef622e7 100755 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.3.8 \ No newline at end of file +sbt.version=1.3.9 \ No newline at end of file