From e80784b5aa0270369554c52d80f7639944091ed1 Mon Sep 17 00:00:00 2001 From: ddworak Date: Wed, 9 Oct 2019 17:32:54 +0200 Subject: [PATCH 1/4] Dependency updates --- .travis.yml | 2 +- build.sbt | 14 +++++++------- project/build.properties | 3 ++- project/plugins.sbt | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49f4d8e..04edd58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty jdk: oraclejdk8 scala: - 2.11.12 - - 2.12.7 + - 2.12.10 before_script: - "export DISPLAY=:99.0" diff --git a/build.sbt b/build.sbt index f32933c..5d51c5c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -import org.openqa.selenium.chrome.ChromeOptions + name := "udash-jquery" @@ -8,8 +8,8 @@ inThisBuild(Seq( )) val commonSettings = Seq( - scalaVersion := "2.12.7", - crossScalaVersions := Seq("2.11.12", "2.12.7"), + scalaVersion := "2.12.10", + crossScalaVersions := Seq("2.11.12", "2.12.10"), scalacOptions ++= Seq( "-feature", "-deprecation", @@ -34,7 +34,7 @@ val commonSettings = Seq( ) val commonJSSettings = Seq( - Compile / emitSourceMaps := true, + //Compile / emitSourceMaps := true, Test / parallelExecution := false, Test / scalaJSStage := FastOptStage, // ScalaJSBundlerPlugin does not work with scalajs-env-selenium: @@ -55,9 +55,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/project/build.properties b/project/build.properties index e71780d..ebcc8ac 100755 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1,2 @@ -sbt.version = 1.2.6 \ No newline at end of file +# suppress inspection "UnusedProperty" +sbt.version=1.3.2 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 9155818..6b9840d 100755 --- 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") From 9c9224817f6c85c4124598ee9086e83769d22a3e Mon Sep 17 00:00:00 2001 From: ddworak Date: Wed, 9 Oct 2019 17:41:23 +0200 Subject: [PATCH 2/4] Example project fix --- build.sbt | 2 +- example/build.sbt | 4 ++-- example/project/build.properties | 3 ++- example/project/plugins.sbt | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 5d51c5c..975350e 100644 --- a/build.sbt +++ b/build.sbt @@ -34,7 +34,7 @@ val commonSettings = Seq( ) val commonJSSettings = Seq( - //Compile / emitSourceMaps := true, + Compile / emitSourceMaps := true, Test / parallelExecution := false, Test / scalaJSStage := FastOptStage, // ScalaJSBundlerPlugin does not work with scalajs-env-selenium: diff --git a/example/build.sbt b/example/build.sbt index 81a3d89..8cf9c90 100644 --- a/example/build.sbt +++ b/example/build.sbt @@ -6,8 +6,8 @@ inThisBuild(Seq( )) val commonSettings = Seq( - scalaVersion := "2.12.7", - crossScalaVersions := Seq("2.11.12", "2.12.7"), + scalaVersion := "2.12.10", + crossScalaVersions := Seq("2.11.12", "2.12.10"), scalacOptions ++= Seq( "-feature", "-deprecation", diff --git a/example/project/build.properties b/example/project/build.properties index e71780d..ebcc8ac 100644 --- a/example/project/build.properties +++ b/example/project/build.properties @@ -1 +1,2 @@ -sbt.version = 1.2.6 \ No newline at end of file +# suppress inspection "UnusedProperty" +sbt.version=1.3.2 \ No newline at end of file diff --git a/example/project/plugins.sbt b/example/project/plugins.sbt index 4432bca..cafe39a 100644 --- 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") \ No newline at end of file +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6") \ No newline at end of file From 18921b23ec77b4486d4dfd15e3c495cd2ae836ea Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 10 Oct 2019 13:49:36 +0200 Subject: [PATCH 3/4] Add 2.13 support, drop 2.11 --- .travis.yml | 5 +++-- build.sbt | 21 +++++++------------ .../io/udash/wrappers/jquery/JQuery.scala | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04edd58..d7fb0c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ language: scala dist: trusty -jdk: oraclejdk8 +jdk: openjdk11 + scala: - - 2.11.12 - 2.12.10 + - 2.13.1 before_script: - "export DISPLAY=:99.0" diff --git a/build.sbt b/build.sbt index 975350e..6bff42d 100644 --- a/build.sbt +++ b/build.sbt @@ -3,13 +3,13 @@ name := "udash-jquery" inThisBuild(Seq( - version := "3.0.0", + version := "3.0.1", organization := "io.udash", )) val commonSettings = Seq( - scalaVersion := "2.12.10", - crossScalaVersions := Seq("2.11.12", "2.12.10"), + 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( diff --git a/src/main/scala/io/udash/wrappers/jquery/JQuery.scala b/src/main/scala/io/udash/wrappers/jquery/JQuery.scala index 61ab8f2..8218c5a 100644 --- 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 From 58cc6f0a538e9f368c8352d73b981e31bc287664 Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 10 Oct 2019 13:58:25 +0200 Subject: [PATCH 4/4] Example update and test simplification --- .travis.yml | 6 ++---- example/build.sbt | 17 ++++++----------- example/project/Dependencies.scala | 6 +++--- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7fb0c2..56f862c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ dist: trusty jdk: openjdk11 scala: - - 2.12.10 - 2.13.1 before_script: @@ -23,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 \ No newline at end of file + - sbt +test +publishLocal + - cd example && sbt compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics \ No newline at end of file diff --git a/example/build.sbt b/example/build.sbt index 8cf9c90..04eeabb 100644 --- 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.10", - crossScalaVersions := Seq("2.11.12", "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 index 9f9e3d9..d557764 100644 --- 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 ))