Demo upgrade

Author: Starzu

.travis.yml

@@ -24,4 +24,4 @@ before_script:
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
-  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile
+  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile fullOptJS

example/README.md

@@ -0,0 +1,4 @@
+### How to use?
+
+Run `sbt fastOptJS` or `sbt fullOptJS` to compile this demo. You can find all generated files 
+in the `generated` directory. Open `index.html` in your browser. 

example/build.sbt

@@ -1,48 +1,61 @@
-import UdashBuild._
-import Dependencies._
-
 name := "jquery-demo"
 
-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(
-  "-feature",
-  "-deprecation",
-  "-unchecked",
-  "-language:implicitConversions",
-  "-language:existentials",
-  "-language:dynamics",
-  "-Xfuture",
-  "-Xfatal-warnings"
-)
+inThisBuild(Seq(
+  version := "1.2.0",
+  organization := "io.udash",
+  scalaVersion := "2.12.6",
+  scalacOptions ++= Seq(
+    "-feature",
+    "-deprecation",
+    "-unchecked",
+    "-language:implicitConversions",
+    "-language:existentials",
+    "-language:dynamics",
+    "-language:postfixOps",
+    "-Xfuture",
+    "-Xfatal-warnings",
+    "-Xlint:_",
+  ),
+  scalacOptions ++= {
+    if (CrossVersion.partialVersion((`jquery-demo` / scalaVersion).value).contains((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 generatedDir = file("generated")
+val copyAssets = taskKey[Unit]("Copies all assets to the target directory.")
 val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
   .settings(
-    libraryDependencies ++= deps.value,
+    libraryDependencies ++= Dependencies.deps.value,
 
     /* move these files out of target/. */
-    crossTarget  in (Compile, fullOptJS) := generatedDir,
-    crossTarget  in (Compile, fastOptJS) := generatedDir,
-    crossTarget  in (Compile, packageJSDependencies) := generatedDir,
-    crossTarget  in (Compile, packageMinifiedJSDependencies) := generatedDir,
+    Compile / fullOptJS / crossTarget := generatedDir,
+    Compile / fastOptJS / crossTarget := generatedDir,
+    Compile / packageJSDependencies / crossTarget := generatedDir,
+    Compile / packageMinifiedJSDependencies / crossTarget := generatedDir,
 
-    compile := (compile in Compile).dependsOn(compileStatics).value,
-    compileStatics := {
-      compileStaticsForRelease.value
-      (crossTarget.value / StaticFilesDir).***.get
-    },
+    Compile / fastOptJS := (Compile / fastOptJS).dependsOn(copyAssets).value,
+    Compile / fullOptJS := (Compile / fullOptJS).dependsOn(copyAssets).value,
 
     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"
+    copyAssets := {
+      IO.copyFile(
+        sourceDirectory.value / "main/assets/index.html",
+        generatedDir / "index.html"
+      )
+    },
+
+    Compile / fastOptJS / artifactPath :=
+      (Compile / fastOptJS / crossTarget).value / "scripts" / "frontend-impl.js",
+    Compile / fullOptJS / artifactPath :=
+      (Compile / fullOptJS / crossTarget).value / "scripts" / "frontend-impl.js",
+    Compile / packageJSDependencies / artifactPath :=
+      (Compile / packageJSDependencies / crossTarget).value / "scripts" / "frontend-deps.js",
+    Compile / packageMinifiedJSDependencies / artifactPath :=
+      (Compile / packageMinifiedJSDependencies / crossTarget).value / "scripts" / "frontend-deps.js"
   )

example/project/Dependencies.scala

@@ -2,8 +2,8 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt._
 
 object Dependencies {
-  val udashCoreVersion = "0.5.0"
-  val udashJQueryVersion = "1.1.0"
+  val udashCoreVersion = "0.6.1"
+  val udashJQueryVersion = "1.2.0"
 
   val deps = Def.setting(Seq[ModuleID](
     "io.udash" %%% "udash-core-frontend" % udashCoreVersion,

example/project/UdashBuild.scala

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

example/project/build.properties

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

example/project/plugins.sbt

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

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

@@ -1,7 +1,6 @@
 package io.udash.demos.jquery
 
 import io.udash._
-import io.udash.utils.Bidirectional
 
 class RoutingRegistryDef extends RoutingRegistry[RoutingState] {
   def matchUrl(url: Url): RoutingState =
@@ -10,7 +9,7 @@ class RoutingRegistryDef extends RoutingRegistry[RoutingState] {
   def matchState(state: RoutingState): Url =
     Url(state2Url.apply(state))
 
-  private val (url2State, state2Url) = Bidirectional[String, RoutingState] {
+  private val (url2State, state2Url) = bidirectional {
     case "" => IndexState
     case "/add" => AddState
     case "/addBack" => AddBackState