From ee7b116137867ed0980310918bc026a19bb74395 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Mon, 15 Aug 2016 21:35:33 +0700 Subject: [PATCH 1/2] Project: update Scala.js --- project/Build.scala | 18 +++++++++--------- project/build.properties | 4 +--- project/plugins.sbt | 2 +- .../org/codingteam/loglist/Application.scala | 9 ++++----- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 6844798..d9cf629 100644 --- a/project/Build.scala +++ b/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,13 +48,13 @@ 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, @@ -62,8 +62,8 @@ object ApplicationBuild extends Build with UniversalKeys { 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" } diff --git a/project/build.properties b/project/build.properties index 5d09244..0af0d40 100644 --- a/project/build.properties +++ b/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 diff --git a/project/plugins.sbt b/project/plugins.sbt index b3291db..3098452 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,4 +15,4 @@ 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") \ No newline at end of file +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11") \ No newline at end of file diff --git a/scalajs/src/main/scala/ru/org/codingteam/loglist/Application.scala b/scalajs/src/main/scala/ru/org/codingteam/loglist/Application.scala index 0f6f177..fbc651f 100644 --- a/scalajs/src/main/scala/ru/org/codingteam/loglist/Application.scala +++ b/scalajs/src/main/scala/ru/org/codingteam/loglist/Application.scala @@ -1,18 +1,17 @@ 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 } } @@ -20,7 +19,7 @@ object Application extends js.JSApp { 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 } From 1fcffaf08577b5ef305454a3afd73936e7416e6a Mon Sep 17 00:00:00 2001 From: Hagane Date: Sat, 20 Aug 2016 15:55:16 +0700 Subject: [PATCH 2/2] remove unneeded plugins --- .gitignore | 2 +- project/plugins.sbt | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 254c152..9c91bf4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ target tmp .history dist -/.idea +.idea *.iml /out /.idea_modules diff --git a/project/plugins.sbt b/project/plugins.sbt index 3098452..4a6e520 100644 --- a/project/plugins.sbt +++ b/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-js" % "sbt-scalajs" % "0.6.11") \ No newline at end of file