[WIP] Update Scala.js

.gitignore

@@ -5,7 +5,7 @@ target
 tmp
 .history
 dist
-/.idea
+.idea
 *.iml
 /out
 /.idea_modules

project/Build.scala

@@ -3,10 +3,10 @@ import Keys._
 import play.Play._
 import play.Play.autoImport._
 import PlayKeys._
-import scala.scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
 import com.typesafe.sbt.packager.universal.UniversalKeys
 import com.typesafe.sbteclipse.core.EclipsePlugin.EclipseKeys
+import org.scalajs.sbtplugin.ScalaJSPlugin
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object ApplicationBuild extends Build with UniversalKeys {
 
@@ -24,7 +24,7 @@ object ApplicationBuild extends Build with UniversalKeys {
   lazy val scalajs = Project(
     id   = "scalajs",
     base = file("scalajs")
-  ) settings (scalajsSettings: _*)
+  ) enablePlugins (ScalaJSPlugin) settings (scalajsSettings: _*)
 
   lazy val sharedScala = Project(
     id = "sharedScala",
@@ -39,7 +39,7 @@ object ApplicationBuild extends Build with UniversalKeys {
       scalajsOutputDir := (crossTarget in Compile).value / "classes" / "public" / "javascripts",
       compile in Compile <<= (compile in Compile) dependsOn (
         fullOptJS in (scalajs, Compile),
-        packageLauncher in (scalajs, Compile)),
+        packageScalaJSLauncher in (scalajs, Compile)),
       scalacOptions in Compile ++= Seq("-unchecked", "-deprecation", "-feature"),
       javacOptions in Compile ++= Seq("-source", "1.7", "-target", "1.7"),
       dist <<= dist dependsOn (fullOptJS in (scalajs, Compile)),
@@ -48,22 +48,22 @@ object ApplicationBuild extends Build with UniversalKeys {
       EclipseKeys.skipParents in ThisBuild := false
     ) ++ (
       // ask scalajs project to put its outputs in scalajsOutputDir
-      Seq(packageExternalDepsJS, packageInternalDepsJS, packageExportedProductsJS, packageLauncher, fastOptJS, fullOptJS) map { packageJSKey =>
+      Seq(packageScalaJSLauncher, fastOptJS, fullOptJS) map { packageJSKey =>
         crossTarget in (scalajs, Compile, packageJSKey) := scalajsOutputDir.value
       }
     ) ++ sharedDirectorySettings
 
   lazy val scalajsSettings =
-    scalaJSSettings ++ Seq(
+    Seq(
       name := "loglist-scalajs",
       version := Versions.app,
       scalaVersion := Versions.scala,
       persistLauncher := true,
       persistLauncher in Test := false,
       resolvers += Resolver.sonatypeRepo("releases"),
       libraryDependencies ++= Seq(
-        "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6",
-        "com.lihaoyi" %%% "upickle" % "0.2.5"
+        "org.scala-js" %%% "scalajs-dom" % "0.9.0",
+        "com.lihaoyi" %%% "upickle" % "0.4.1"
       ) ++ Dependencies.scalajs
     ) ++ sharedDirectorySettings
 
@@ -114,5 +114,5 @@ object Dependencies {
 
 object Versions {
   val app = "1.2.1"
-  val scala = "2.11.2"
+  val scala = "2.11.8"
 }

project/build.properties

@@ -1,4 +1,2 @@
-#Activator-generated Properties
-#Mon Sep 22 22:35:45 NOVT 2014
 template.uuid=9d0f021d-ca8f-4a88-992f-f6468442419e
-sbt.version=0.13.5
+sbt.version=0.13.9

project/plugins.sbt

@@ -4,15 +4,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4")
 
 // web plugins
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.0.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.1")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.1")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.0.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.0.0")
-
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11")

scalajs/src/main/scala/ru/org/codingteam/loglist/Application.scala

@@ -1,26 +1,25 @@
 package ru.org.codingteam.loglist
 
 import org.scalajs.dom
-import org.scalajs.dom.extensions.Ajax
-import org.scalajs.dom.extensions._
+import org.scalajs.dom.ext._
 import org.scalajs.dom.{Element, Event}
-
 import scala.scalajs.js
+import upickle.default._
 
 object Application extends js.JSApp {
 
   def voteHandler(action: String, id: String, ratingContainer: Element)(event: Event) = {
     import scala.scalajs.concurrent.JSExecutionContext.Implicits.queue
     Ajax.post(s"/quote/$id/$action").onSuccess { case request =>
-      val response = upickle.read[QuoteRating](request.responseText)
+      val response = read[QuoteRating](request.responseText)
       ratingContainer.textContent = response.rating.toString
     }
   }
 
   def fillSuggestedQuoteCounters() = {
     import scala.scalajs.concurrent.JSExecutionContext.Implicits.queue
     Ajax.get(s"/quote/count/suggested").onSuccess { case request =>
-      val response = upickle.read[SuggestedQuoteCount](request.responseText)
+      val response = read[SuggestedQuoteCount](request.responseText)
       dom.document.querySelectorAll(".suggested-quote-counter").map { node =>
         node.textContent = response.count.toString
       }