Merge pull request #24 from UdashFramework/2.13

ddworak · web-flow · commit 3f14b9fc96bf · 2019-10-14T16:01:08.000+02:00
Add 2.13 support, drop 2.11
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: scala
 dist: trusty
 
-jdk: oraclejdk8
+jdk: openjdk11
+
 scala:
-  - 2.11.12
-  - 2.12.7
+  - 2.13.1
 
 before_script:
   - "export DISPLAY=:99.0"
@@ -22,6 +22,5 @@ before_script:
   - export PATH=$PWD/selenium-bin:$PATH
 
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION test
-  - sbt ++$TRAVIS_SCALA_VERSION publishLocal
-  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics
+  - sbt +test +publishLocal
+  - cd example && sbt compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics
diff --git a/build.sbt b/build.sbt
@@ -1,15 +1,15 @@
-import org.openqa.selenium.chrome.ChromeOptions
+
 
 name := "udash-jquery"
 
 inThisBuild(Seq(
-  version := "3.0.0",
+  version := "3.0.1",
   organization := "io.udash",
 ))
 
 val commonSettings = Seq(
-  scalaVersion := "2.12.7",
-  crossScalaVersions := Seq("2.11.12", "2.12.7"),
+  scalaVersion := "2.13.1",
+  crossScalaVersions := Seq("2.12.10", "2.13.1"),
   scalacOptions ++= Seq(
     "-feature",
     "-deprecation",
@@ -19,18 +19,13 @@ val commonSettings = Seq(
     "-language:dynamics",
     "-language:postfixOps",
     "-language:experimental.macros",
-    "-Xfuture",
     "-Xfatal-warnings",
-    "-Xlint:_"
+    "-Xlint:_",
+    "-Ywarn-unused:_,-explicits,-implicits",
+    "-Ybackend-parallelism", "4",
+    "-Ycache-plugin-class-loader:last-modified",
+    "-Ycache-macro-class-loader:last-modified",
   ),
-  scalacOptions ++= {
-    if (scalaBinaryVersion.value == "2.12") Seq(
-      "-Ywarn-unused:_,-explicits,-implicits",
-      "-Ybackend-parallelism", "4",
-      "-Ycache-plugin-class-loader:last-modified",
-      "-Ycache-macro-class-loader:last-modified"
-    ) else Seq.empty
-  }
 )
 
 val commonJSSettings = Seq(
@@ -55,9 +50,9 @@ lazy val root = project.in(file("."))
     commonJSSettings,
 
     libraryDependencies ++= Seq(
-      "org.scala-js" %%% "scalajs-dom" % "0.9.6",
-      "org.scalatest" %%% "scalatest" % "3.0.5" % Test,
-      "com.lihaoyi" %%% "scalatags" % "0.6.7" % Test
+      "org.scala-js" %%% "scalajs-dom" % "0.9.7",
+      "org.scalatest" %%% "scalatest" % "3.0.8" % Test,
+      "com.lihaoyi" %%% "scalatags" % "0.7.0" % Test
     ),
 
     Compile / npmDependencies += "jquery" -> "3.3.1",
diff --git a/example/build.sbt b/example/build.sbt
@@ -1,13 +1,13 @@
 name := "jquery-demo"
 
 inThisBuild(Seq(
-  version := "3.0.0",
+  version := "3.0.1",
   organization := "io.udash",
 ))
 
 val commonSettings = Seq(
-  scalaVersion := "2.12.7",
-  crossScalaVersions := Seq("2.11.12", "2.12.7"),
+  scalaVersion := "2.12.10",
+  crossScalaVersions := Seq("2.12.10"), //todo 2.13
   scalacOptions ++= Seq(
     "-feature",
     "-deprecation",
@@ -16,18 +16,13 @@ val commonSettings = Seq(
     "-language:existentials",
     "-language:dynamics",
     "-language:postfixOps",
-    "-Xfuture",
     "-Xfatal-warnings",
     "-Xlint:_",
+    "-Ywarn-unused:_,-explicits,-implicits",
+    "-Ybackend-parallelism", "4",
+    "-Ycache-plugin-class-loader:last-modified",
+    "-Ycache-macro-class-loader:last-modified"
   ),
-  scalacOptions ++= {
-    if (scalaBinaryVersion.value == "2.12") Seq(
-      "-Ywarn-unused:_,-explicits,-implicits",
-      "-Ybackend-parallelism", "4",
-      "-Ycache-plugin-class-loader:last-modified",
-      "-Ycache-macro-class-loader:last-modified"
-    ) else Seq.empty
-  },
 
   libraryDependencies ++= Dependencies.deps.value
 )
diff --git a/example/project/Dependencies.scala b/example/project/Dependencies.scala
@@ -3,11 +3,11 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 import sbt._
 
 object Dependencies {
-  val udashCoreVersion = "0.6.1"
-  val udashJQueryVersion = "3.0.0"
+  val udashCoreVersion = "0.8.1"
+  val udashJQueryVersion = "3.0.1"
 
   val deps = Def.setting(Seq[ModuleID](
-    "io.udash" %%% "udash-core-frontend" % udashCoreVersion,
+    "io.udash" %%% "udash-core" % udashCoreVersion,
     "io.udash" %%% "udash-jquery" % udashJQueryVersion
   ))
 
diff --git a/example/project/build.properties b/example/project/build.properties
@@ -1 +1,2 @@
-sbt.version = 1.2.6
+# suppress inspection "UnusedProperty"
+sbt.version=1.3.2
diff --git a/example/project/plugins.sbt b/example/project/plugins.sbt
@@ -1,4 +1,4 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.14.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6")
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1,2 @@
-sbt.version = 1.2.6
+# suppress inspection "UnusedProperty"
+sbt.version=1.3.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,5 +2,5 @@ logLevel := Level.Warn
 
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.3.0"
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.14.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6")
diff --git a/src/main/scala/io/udash/wrappers/jquery/JQuery.scala b/src/main/scala/io/udash/wrappers/jquery/JQuery.scala
@@ -1,6 +1,6 @@
 package io.udash.wrappers.jquery
 
-import org.scalajs.dom._
+import org.scalajs.dom.Element
 
 import scala.collection.mutable
 import scala.scalajs.js

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-sbt.version = 1.2.6`
	`1`	`+# suppress inspection "UnusedProperty"`
	`2`	`+sbt.version=1.3.2`