From 82828c8d7dc215a3a6d87cbf8b3ce4e2c6983736 Mon Sep 17 00:00:00 2001
From: Starzu <m.starzec@avsystem.com>
Date: Thu, 7 Sep 2017 11:22:44 +0200
Subject: [PATCH] Scala.js 1.0.0-M1

---
 .travis.yml              | 10 +++++++---
 build.sbt                | 16 +++++++---------
 project/build.properties |  2 +-
 project/plugins.sbt      | 12 ++++++++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a5db0c..bfa7fa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,11 @@ dist: trusty
 jdk: oraclejdk8
 scala:
   - 2.11.11
-  - 2.12.2
+  - 2.12.3
+
+env:
+  - SCALAJS_VERSION="0.6.20"
+  - SCALAJS_VERSION="1.0.0-M1"
 
 before_script:
   - "export DISPLAY=:99.0"
@@ -17,11 +21,11 @@ before_script:
   - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
   - sudo dpkg -i google-chrome*.deb
   # Install Selenium chromedriver
-  - wget http://chromedriver.storage.googleapis.com/2.25/chromedriver_linux64.zip
+  - wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip -d selenium-bin
   - export PATH=$PWD/selenium-bin:$PATH
 
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION "set (jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Chrome))" test
+  - sbt ++$TRAVIS_SCALA_VERSION "set (jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.openqa.selenium.remote.DesiredCapabilities.chrome()))" test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
   - cd example && sbt ++$TRAVIS_SCALA_VERSION compile
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index 17f5081..0685798 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,10 +1,10 @@
 
 name := "udash-jquery"
 
-version := "1.1.0"
+version := "1.1.1"
 organization := "io.udash"
-scalaVersion := "2.12.2"
-crossScalaVersions := Seq("2.11.11", "2.12.2")
+scalaVersion := "2.12.3"
+crossScalaVersions := Seq("2.11.11", "2.12.3")
 scalacOptions in ThisBuild ++= Seq(
   "-feature",
   "-deprecation",
@@ -20,18 +20,16 @@ scalacOptions in ThisBuild ++= Seq(
   }.getOrElse("-Xlint:_")
 )
 
-jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Firefox())
+jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.openqa.selenium.remote.DesiredCapabilities.chrome())
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.9.2",
+  "org.scala-js" %%% "scalajs-dom" % "0.9.3",
   "org.scalatest" %%% "scalatest" % "3.0.3" % Test,
   "com.lihaoyi" %%% "scalatags" % "0.6.5" % Test
 )
 
-jsDependencies +=
-  "org.webjars" % "jquery" % "3.2.1" / "3.2.1/jquery.js" minified "3.2.1/jquery.min.js"
-
-requiresDOM in Test := true
+jsDependencies += "org.webjars" % "jquery" % "3.2.1" / "3.2.1/jquery.js" minified "3.2.1/jquery.min.js"
 
 lazy val root = project.in(file("."))
   .enablePlugins(ScalaJSPlugin)
+  .enablePlugins(JSDependenciesPlugin)
diff --git a/project/build.properties b/project/build.properties
index 6be4958..826c0bd 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.15
\ No newline at end of file
+sbt.version = 0.13.16
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3a623d2..56e1075 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,13 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+val scalaJSVersion =
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.20")
 
-libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+
+{
+  if (scalaJSVersion.startsWith("0.6.")) Nil
+  else Seq(addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.0-M1"))
+}
+
+libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.2.0"