Skip to content

Commit 7c68f09

Browse files
author
Starzu
committed
Upgrade to jQuery 3.2.1
1 parent d4200c6 commit 7c68f09

File tree

6 files changed

+197
-459
lines changed

6 files changed

+197
-459
lines changed

build.sbt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
name := "udash-jquery"
33

4-
version := "1.0.1"
4+
version := "1.1.0"
55
organization := "io.udash"
6-
scalaVersion := "2.12.1"
7-
crossScalaVersions := Seq("2.11.8", "2.12.1")
6+
scalaVersion := "2.12.2"
7+
crossScalaVersions := Seq("2.11.11", "2.12.2")
88
scalacOptions in ThisBuild ++= Seq(
99
"-feature",
1010
"-deprecation",
@@ -14,23 +14,24 @@ scalacOptions in ThisBuild ++= Seq(
1414
"-language:dynamics",
1515
"-Xfuture",
1616
"-Xfatal-warnings",
17-
"-Xlint:_,-missing-interpolator,-adapted-args"
17+
CrossVersion.partialVersion(scalaVersion.value).collect {
18+
// WORKAROUND https://github.com/scala/scala/pull/5402
19+
case (2, 12) => "-Xlint:-unused,_"
20+
}.getOrElse("-Xlint:_")
1821
)
1922

20-
jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Firefox)
23+
jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Firefox())
2124

2225
libraryDependencies ++= Seq(
23-
"org.scala-js" %%% "scalajs-dom" % "0.9.1",
24-
"org.scalatest" %%% "scalatest" % "3.0.1" % Test,
25-
"com.lihaoyi" %%% "scalatags" % "0.6.2" % Test
26+
"org.scala-js" %%% "scalajs-dom" % "0.9.2",
27+
"org.scalatest" %%% "scalatest" % "3.0.3" % Test,
28+
"com.lihaoyi" %%% "scalatags" % "0.6.5" % Test
2629
)
2730

2831
jsDependencies +=
29-
"org.webjars" % "jquery" % "2.2.4" / "2.2.4/jquery.js" minified "2.2.4/jquery.min.js"
32+
"org.webjars" % "jquery" % "3.2.1" / "3.2.1/jquery.js" minified "3.2.1/jquery.min.js"
3033

3134
requiresDOM in Test := true
32-
persistLauncher in Test := false
33-
scalaJSUseRhino in Test := false
3435

3536
lazy val root = project.in(file("."))
3637
.enablePlugins(ScalaJSPlugin)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.13
1+
sbt.version = 0.13.15

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
logLevel := Level.Warn
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
44

55
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"

0 commit comments

Comments
 (0)