Merge pull request #12 from UdashFramework/jq-3

Upgrade to jQuery 3.2.1

Author: Starzu

.travis.yml

@@ -3,8 +3,8 @@ dist: trusty
 
 jdk: oraclejdk8
 scala:
-  - 2.11.8
-  - 2.12.1
+  - 2.11.11
+  - 2.12.2
 
 before_script:
   - "export DISPLAY=:99.0"
@@ -24,4 +24,4 @@ before_script:
 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 publishLocal
-  # - cd example && sbt ++$TRAVIS_SCALA_VERSION compile
+  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile

README.md

@@ -7,7 +7,7 @@ Static types for the jQuery API for [Scala.js](http://www.scala-js.org/) program
 Add the following to your SBT build:
 
 ```scala
-libraryDependencies += "io.udash" %%% "udash-jquery" % "1.0.0"
+libraryDependencies += "io.udash" %%% "udash-jquery" % "1.1.0"
 ```
 
 then import the jQuery package: 

build.sbt

@@ -1,10 +1,10 @@
 
 name := "udash-jquery"
 
-version := "1.0.1"
+version := "1.1.0"
 organization := "io.udash"
-scalaVersion := "2.12.1"
-crossScalaVersions := Seq("2.11.8", "2.12.1")
+scalaVersion := "2.12.2"
+crossScalaVersions := Seq("2.11.11", "2.12.2")
 scalacOptions in ThisBuild ++= Seq(
   "-feature",
   "-deprecation",
@@ -14,23 +14,24 @@ scalacOptions in ThisBuild ++= Seq(
   "-language:dynamics",
   "-Xfuture",
   "-Xfatal-warnings",
-  "-Xlint:_,-missing-interpolator,-adapted-args"
+  CrossVersion.partialVersion(scalaVersion.value).collect {
+    // WORKAROUND https://github.com/scala/scala/pull/5402
+    case (2, 12) => "-Xlint:-unused,_"
+  }.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.scalajs.jsenv.selenium.Firefox())
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.9.1",
-  "org.scalatest" %%% "scalatest" % "3.0.1" % Test,
-  "com.lihaoyi" %%% "scalatags" % "0.6.2" % Test
+  "org.scala-js" %%% "scalajs-dom" % "0.9.2",
+  "org.scalatest" %%% "scalatest" % "3.0.3" % Test,
+  "com.lihaoyi" %%% "scalatags" % "0.6.5" % Test
 )
 
 jsDependencies +=
-  "org.webjars" % "jquery" % "2.2.4" / "2.2.4/jquery.js" minified "2.2.4/jquery.min.js"
+  "org.webjars" % "jquery" % "3.2.1" / "3.2.1/jquery.js" minified "3.2.1/jquery.min.js"
 
 requiresDOM in Test := true
-persistLauncher in Test := false
-scalaJSUseRhino in Test := false
 
 lazy val root = project.in(file("."))
   .enablePlugins(ScalaJSPlugin)

example/build.sbt

@@ -1,7 +1,10 @@
+import UdashBuild._
+import Dependencies._
+
 name := "jquery-demo"
 
-version in ThisBuild := "1.0.1-SNAPSHOT"
-scalaVersion in ThisBuild := "2.11.8"
+version in ThisBuild := "1.1.0"
+scalaVersion in ThisBuild := "2.12.2"
 organization in ThisBuild := "io.udash"
 crossPaths in ThisBuild := false
 scalacOptions in ThisBuild ++= Seq(
@@ -12,37 +15,34 @@ scalacOptions in ThisBuild ++= Seq(
   "-language:existentials",
   "-language:dynamics",
   "-Xfuture",
-  "-Xfatal-warnings",
-  "-Xlint:_,-missing-interpolator,-adapted-args"
+  "-Xfatal-warnings"
 )
 
 val generatedDir = file("generated")
 val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
   .settings(
     libraryDependencies ++= deps.value,
-    persistLauncher in Compile := true,
 
     /* move these files out of target/. */
     crossTarget  in (Compile, fullOptJS) := generatedDir,
     crossTarget  in (Compile, fastOptJS) := generatedDir,
     crossTarget  in (Compile, packageJSDependencies) := generatedDir,
-    crossTarget  in (Compile, packageScalaJSLauncher) := generatedDir,
     crossTarget  in (Compile, packageMinifiedJSDependencies) := generatedDir,
 
-    compile <<= (compile in Compile).dependsOn(compileStatics),
+    compile := (compile in Compile).dependsOn(compileStatics).value,
     compileStatics := {
       compileStaticsForRelease.value
       (crossTarget.value / StaticFilesDir).***.get
     },
 
+    scalaJSUseMainModuleInitializer := true,
+
     artifactPath in(Compile, fastOptJS) :=
       (crossTarget in(Compile, fastOptJS)).value / StaticFilesDir / WebContent / "scripts" / "frontend-impl-fast.js",
     artifactPath in(Compile, fullOptJS) :=
       (crossTarget in(Compile, fullOptJS)).value / StaticFilesDir / WebContent / "scripts" / "frontend-impl.js",
     artifactPath in(Compile, packageJSDependencies) :=
       (crossTarget in(Compile, packageJSDependencies)).value / StaticFilesDir / WebContent / "scripts" / "frontend-deps-fast.js",
     artifactPath in(Compile, packageMinifiedJSDependencies) :=
-      (crossTarget in(Compile, packageMinifiedJSDependencies)).value / StaticFilesDir / WebContent / "scripts" / "frontend-deps.js",
-    artifactPath in(Compile, packageScalaJSLauncher) :=
-      (crossTarget in(Compile, packageScalaJSLauncher)).value / StaticFilesDir / WebContent / "scripts" / "frontend-init.js"
+      (crossTarget in(Compile, packageMinifiedJSDependencies)).value / StaticFilesDir / WebContent / "scripts" / "frontend-deps.js"
   )

example/project/Dependencies.scala

@@ -1,15 +1,12 @@
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt._
 
-object Dependencies extends Build {
-  val udashCoreVersion = "0.4.0"
-  val udashJQueryVersion = "1.0.1"
+object Dependencies {
+  val udashCoreVersion = "0.5.0"
+  val udashJQueryVersion = "1.1.0"
 
   val deps = Def.setting(Seq[ModuleID](
     "io.udash" %%% "udash-core-frontend" % udashCoreVersion,
     "io.udash" %%% "udash-jquery" % udashJQueryVersion
   ))
-
-  val depsJS = Def.setting(Seq[org.scalajs.sbtplugin.JSModuleID](
-  ))
 }

example/project/UdashBuild.scala

@@ -2,7 +2,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.AutoImport._
 import sbt.Keys._
 import sbt._
 
-object UdashBuild extends Build {
+object UdashBuild {
   val StaticFilesDir = "UdashStatic"
   val WebContent = "WebContent"
 

example/project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 0.13.15

example/project/plugins.sbt

@@ -1,2 +1,2 @@
 logLevel := Level.Warn
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")

example/src/main/assets/index.dev.html

@@ -6,7 +6,6 @@
 
     <script src="scripts/frontend-deps-fast.js"></script>
     <script src="scripts/frontend-impl-fast.js"></script>
-    <script src="scripts/frontend-init.js"></script>
 
 </head>
 <body>

example/src/main/assets/index.prod.html

@@ -6,7 +6,6 @@
 
     <script src="scripts/frontend-deps.js"></script>
     <script src="scripts/frontend-impl.js"></script>
-    <script src="scripts/frontend-init.js"></script>
 
 </head>
 <body>

example/src/main/scala/io/udash/demos/jquery/init.scala

@@ -16,12 +16,12 @@ object Context {
   implicit val applicationInstance = new Application[RoutingState](routingRegistry, viewPresenterRegistry, RootState)
 }
 
-object Init extends JSApp {
+object Init {
   import Context._
 
   @JSExport
-  override def main(): Unit = {
-    jQ(document).ready((_: Element) => {
+  def main(args: Array[String]): Unit = {
+    jQ((_: Element) => {
       val appRoot = jQ("#application").get(0)
       if (appRoot.isEmpty) {
         dom.console.error("Application root element not found! Check you index.html file!")

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 0.13.15

project/plugins.sbt

@@ -1,5 +1,5 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
 
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"