Skip to content

Commit 6f7d988

Browse files
author
Starzu
committed
Dependencies and build update
1 parent be4ab57 commit 6f7d988

File tree

4 files changed

+65
-31
lines changed

4 files changed

+65
-31
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ dist: trusty
33

44
jdk: oraclejdk8
55
scala:
6-
- 2.11.11
7-
- 2.12.2
6+
- 2.11.12
7+
- 2.12.6
88

99
before_script:
1010
- "export DISPLAY=:99.0"
@@ -22,6 +22,6 @@ before_script:
2222
- export PATH=$PWD/selenium-bin:$PATH
2323

2424
script:
25-
- sbt ++$TRAVIS_SCALA_VERSION "set (jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Chrome))" test
25+
- sbt ++$TRAVIS_SCALA_VERSION test
2626
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
2727
- cd example && sbt ++$TRAVIS_SCALA_VERSION compile

build.sbt

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,71 @@
1+
import org.openqa.selenium.chrome.ChromeOptions
2+
import org.openqa.selenium.remote.DesiredCapabilities
3+
import org.scalajs.jsenv.selenium.SeleniumJSEnv
14

25
name := "udash-jquery"
36

4-
version := "1.1.1"
5-
organization := "io.udash"
6-
scalaVersion := "2.12.2"
7-
crossScalaVersions := Seq("2.11.11", "2.12.2")
8-
scalacOptions in ThisBuild ++= Seq(
9-
"-feature",
10-
"-deprecation",
11-
"-unchecked",
12-
"-language:implicitConversions",
13-
"-language:existentials",
14-
"-language:dynamics",
15-
"-Xfuture",
16-
"-Xfatal-warnings",
17-
CrossVersion.partialVersion(scalaVersion.value).collect {
18-
// WORKAROUND https://github.com/scala/scala/pull/5402
19-
case (2, 12) => "-Xlint:-unused,_"
20-
}.getOrElse("-Xlint:_")
21-
)
7+
inThisBuild(Seq(
8+
version := "1.2.0",
9+
organization := "io.udash",
10+
scalaVersion := "2.12.6",
11+
crossScalaVersions := Seq("2.11.12", "2.12.6"),
12+
scalacOptions ++= Seq(
13+
"-feature",
14+
"-deprecation",
15+
"-unchecked",
16+
"-language:implicitConversions",
17+
"-language:existentials",
18+
"-language:dynamics",
19+
"-language:postfixOps",
20+
"-language:experimental.macros",
21+
"-Xfuture",
22+
"-Xfatal-warnings",
23+
"-Xlint:_",
24+
),
25+
scalacOptions ++= {
26+
if (CrossVersion.partialVersion((root / scalaVersion).value).contains((2, 12))) Seq(
27+
"-Ywarn-unused:_,-explicits,-implicits",
28+
"-Ybackend-parallelism", "4",
29+
"-Ycache-plugin-class-loader:last-modified",
30+
"-Ycache-macro-class-loader:last-modified"
31+
) else Seq.empty
32+
},
33+
))
34+
35+
// Settings for JS tests run in browser
36+
val browserCapabilities: DesiredCapabilities = {
37+
// requires ChromeDriver: https://sites.google.com/a/chromium.org/chromedriver/
38+
val capabilities = DesiredCapabilities.chrome()
39+
capabilities.setCapability(ChromeOptions.CAPABILITY, {
40+
val options = new ChromeOptions()
41+
options.addArguments("--headless", "--disable-gpu")
42+
options
43+
})
44+
capabilities
45+
}
2246

23-
jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Firefox())
47+
val commonJSSettings = Seq(
48+
Compile / emitSourceMaps := true,
49+
Test / parallelExecution := false,
50+
Test / scalaJSStage := FastOptStage,
51+
Test / jsEnv := new SeleniumJSEnv(browserCapabilities),
52+
scalacOptions += {
53+
val localDir = (ThisBuild / baseDirectory).value.toURI.toString
54+
val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery"
55+
s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/"
56+
},
57+
scalacOptions += "-P:scalajs:sjsDefinedByDefault",
58+
)
2459

2560
libraryDependencies ++= Seq(
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
61+
"org.scala-js" %%% "scalajs-dom" % "0.9.5",
62+
"org.scalatest" %%% "scalatest" % "3.0.5" % Test,
63+
"com.lihaoyi" %%% "scalatags" % "0.6.7" % Test
2964
)
3065

3166
jsDependencies +=
32-
"org.webjars" % "jquery" % "3.2.1" / "3.2.1/jquery.js" minified "3.2.1/jquery.min.js"
33-
34-
requiresDOM in Test := true
67+
"org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js"
3568

3669
lazy val root = project.in(file("."))
3770
.enablePlugins(ScalaJSPlugin)
71+
.settings(commonJSSettings)

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
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.18")
3+
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.2.0"
44

5-
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")

0 commit comments

Comments
 (0)