Skip to content

Commit 18921b2

Browse files
committed
Add 2.13 support, drop 2.11
1 parent 9c92248 commit 18921b2

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
language: scala
22
dist: trusty
33

4-
jdk: oraclejdk8
4+
jdk: openjdk11
5+
56
scala:
6-
- 2.11.12
77
- 2.12.10
8+
- 2.13.1
89

910
before_script:
1011
- "export DISPLAY=:99.0"

build.sbt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
name := "udash-jquery"
44

55
inThisBuild(Seq(
6-
version := "3.0.0",
6+
version := "3.0.1",
77
organization := "io.udash",
88
))
99

1010
val commonSettings = Seq(
11-
scalaVersion := "2.12.10",
12-
crossScalaVersions := Seq("2.11.12", "2.12.10"),
11+
scalaVersion := "2.13.1",
12+
crossScalaVersions := Seq("2.12.10", "2.13.1"),
1313
scalacOptions ++= Seq(
1414
"-feature",
1515
"-deprecation",
@@ -19,18 +19,13 @@ val commonSettings = Seq(
1919
"-language:dynamics",
2020
"-language:postfixOps",
2121
"-language:experimental.macros",
22-
"-Xfuture",
2322
"-Xfatal-warnings",
24-
"-Xlint:_"
23+
"-Xlint:_",
24+
"-Ywarn-unused:_,-explicits,-implicits",
25+
"-Ybackend-parallelism", "4",
26+
"-Ycache-plugin-class-loader:last-modified",
27+
"-Ycache-macro-class-loader:last-modified",
2528
),
26-
scalacOptions ++= {
27-
if (scalaBinaryVersion.value == "2.12") Seq(
28-
"-Ywarn-unused:_,-explicits,-implicits",
29-
"-Ybackend-parallelism", "4",
30-
"-Ycache-plugin-class-loader:last-modified",
31-
"-Ycache-macro-class-loader:last-modified"
32-
) else Seq.empty
33-
}
3429
)
3530

3631
val commonJSSettings = Seq(

src/main/scala/io/udash/wrappers/jquery/JQuery.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.udash.wrappers.jquery
22

3-
import org.scalajs.dom._
3+
import org.scalajs.dom.Element
44

55
import scala.collection.mutable
66
import scala.scalajs.js

0 commit comments

Comments
 (0)