Version 0.5.0

UdashFramework · Jun 7, 2017 · a5fa08e · a5fa08e
1 parent 4f593d4
commit a5fa08e
Show file tree

Hide file tree

Showing 36 changed files with 39 additions and 39 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import UdashWebBuild._
 
 name := "udash-guide"
 
-version in ThisBuild := "0.5.0-SNAPSHOT"
+version in ThisBuild := "0.5.0"
 scalaVersion in ThisBuild := versionOfScala
 organization in ThisBuild := "io.udash"
 scalacOptions in ThisBuild ++= Seq(

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/DefaultStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/DefaultStyles.scala
@@ -5,7 +5,7 @@ import io.udash.web.commons.styles.utils._
 import scala.concurrent.duration.DurationInt
 import scala.language.postfixOps
 import scalacss.internal.{Attr, Literal}
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 trait DefaultStyles extends StyleSheet.Inline {
   import dsl._

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/GlobalStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/GlobalStyles.scala
@@ -5,7 +5,7 @@ import io.udash.web.commons.styles.utils._
 import scala.concurrent.duration.DurationInt
 import scala.language.postfixOps
 import scalacss.internal.Attr
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object GlobalStyles extends UdashStylesheet {
   import dsl._

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/StyleRegistry.scala b/commons/src/main/scala/io/udash/web/commons/styles/StyleRegistry.scala
@@ -3,7 +3,7 @@ package io.udash.web.commons.styles
 import io.udash.wrappers.jquery.jQ
 
 import scala.collection.mutable
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 import scalacss.StyleSheet.{Inline => ISS}
 import scalatags.JsDom.all._
 import scalatags.JsDom.tags2.style

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/UdashStylesheet.scala b/commons/src/main/scala/io/udash/web/commons/styles/UdashStylesheet.scala
@@ -1,6 +1,6 @@
 package io.udash.web.commons.styles
 
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 /**
   * Created by malchik on 2016-04-29.

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/components/CodeBlockStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/components/CodeBlockStyles.scala
@@ -1,6 +1,6 @@
 package io.udash.web.commons.styles.components
 
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 trait CodeBlockStyles extends StyleSheet.Inline {
   val codeWrapper: StyleA

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala
@@ -4,7 +4,7 @@ import io.udash.web.commons.styles.{GlobalStyles, UdashStylesheet}
 import io.udash.web.commons.styles.utils._
 
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 /**
   * Created by malchik on 2016-04-04.

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/components/HeaderButtonsStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/components/HeaderButtonsStyles.scala
@@ -6,7 +6,7 @@ import io.udash.web.commons.styles.utils.{MediaQueries, StyleConstants, StyleUti
 
 import scala.concurrent.duration.{DurationInt, FiniteDuration}
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 trait HeaderButtonsStyles extends StyleSheet.Inline {
   import dsl._

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/components/HeaderNavStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/components/HeaderNavStyles.scala
@@ -7,7 +7,7 @@ import io.udash.web.commons.styles.utils.{MediaQueries, StyleUtils}
 
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 trait HeaderNavStyles extends StyleSheet.Inline {
   import dsl._

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala b/commons/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala
@@ -8,7 +8,7 @@ import io.udash.web.commons.styles.attributes.Attributes
 import io.udash.web.commons.styles.utils.{MediaQueries, StyleConstants, StyleUtils}
 
 import scalacss.internal.Compose
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 import language.postfixOps
 
 object MobileMenuStyles extends UdashStylesheet{

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala b/commons/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala
@@ -1,7 +1,7 @@
 package io.udash.web.commons.styles.utils
 
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 /**
   * Created by malchik on 2016-03-30.

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/utils/StyleConstants.scala b/commons/src/main/scala/io/udash/web/commons/styles/utils/StyleConstants.scala
@@ -4,7 +4,7 @@ package io.udash.web.commons.styles.utils
   * Created by malchik on 2016-03-22.
   */
 
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object StyleConstants extends StyleSheet.Inline{
   import dsl._

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/utils/StyleUtils.scala b/commons/src/main/scala/io/udash/web/commons/styles/utils/StyleUtils.scala
@@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit
 
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 import scalacss.internal.{AV, Attr, Length, ValueT}
 
 object StyleUtils extends StyleSheet.Inline {

diff --git a/commons/src/main/scala/io/udash/web/commons/styles/utils/UdashFonts.scala b/commons/src/main/scala/io/udash/web/commons/styles/utils/UdashFonts.scala
@@ -2,7 +2,7 @@ package io.udash.web.commons.styles.utils
 
 import scala.language.postfixOps
 import scalacss.internal.AV
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object UdashFonts extends StyleSheet.Inline {
   import dsl._

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/GuideDefaultStyles.scala b/guide/src/main/scala/io/udash/web/guide/styles/GuideDefaultStyles.scala
@@ -4,7 +4,7 @@ import io.udash.web.commons.styles.{DefaultStyles, UdashStylesheet}
 import io.udash.web.commons.styles.utils.{FontWeight, MediaQueries, UdashFonts}
 
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object GuideDefaultStyles extends UdashStylesheet with DefaultStyles {
   import dsl._

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/partials/GuideStyles.scala b/guide/src/main/scala/io/udash/web/guide/styles/partials/GuideStyles.scala
@@ -10,7 +10,7 @@ import io.udash.web.guide.styles.utils.{MediaQueries, StyleUtils}
 import scala.concurrent.duration.DurationInt
 import scala.language.postfixOps
 import scalacss.internal.Compose
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object GuideStyles extends UdashStylesheet with CodeBlockStyles {
   import dsl._

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala b/guide/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala
@@ -6,7 +6,7 @@ import io.udash.web.commons.styles.utils.StyleConstants
 import io.udash.web.guide.styles.utils.{MediaQueries, StyleUtils}
 
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 /**
   * Created by malchik on 2016-04-04.

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/partials/MenuStyles.scala b/guide/src/main/scala/io/udash/web/guide/styles/partials/MenuStyles.scala
@@ -12,7 +12,7 @@ import io.udash.web.guide.styles.utils.{MediaQueries, StyleUtils}
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
 import scalacss.internal.Compose
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object MenuStyles extends UdashStylesheet {
   import dsl._

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala b/guide/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala
@@ -2,7 +2,7 @@ package io.udash.web.guide.styles.utils
 
 import io.udash.web.commons.styles.utils.StyleConstants
 
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 import scala.language.postfixOps
 
 /**

diff --git a/guide/src/main/scala/io/udash/web/guide/styles/utils/StyleUtils.scala b/guide/src/main/scala/io/udash/web/guide/styles/utils/StyleUtils.scala
@@ -7,7 +7,7 @@ import io.udash.web.commons.styles.utils.StyleConstants
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
 import scalacss.internal.{AV, Attr, Length, ValueT}
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object StyleUtils extends StyleSheet.Inline {
   import dsl._

diff --git a/guide/src/main/scala/io/udash/web/guide/views/References.scala b/guide/src/main/scala/io/udash/web/guide/views/References.scala
@@ -1,7 +1,7 @@
 package io.udash.web.guide.views
 
 object References {
-  val UdashGeneratorDownload = "https://github.com/UdashFramework/udash-generator/releases/download/v0.4.0/udash-generator.zip"
+  val UdashGeneratorDownload = "https://github.com/UdashFramework/udash-generator/releases/download/v0.5.0/udash-generator.zip"
   val UdashjQueryWrapperRepo = "https://github.com/UdashFramework/scala-js-jquery"
   val UdashGuideRepo = "https://github.com/UdashFramework/udash-guide"
   val UdashFilesDemoRepo = "https://github.com/UdashFramework/udash-demos/tree/master/file-upload"

diff --git a/guide/src/main/scala/io/udash/web/guide/views/Versions.scala b/guide/src/main/scala/io/udash/web/guide/views/Versions.scala
@@ -4,8 +4,8 @@ object Versions {
   val udashVersion = "0.5.0"
   val udashJQueryVersion = "1.0.1"
 
-  val scalaVersion = "2.12.1"
-  val scalaJSPluginVersion = "0.6.15"
+  val scalaVersion = "2.12.2"
+  val scalaJSPluginVersion = "0.6.17"
 
   val jettyVersion = "9.3.11.v20160721"
   val highchartsVersion = "5.0.10"

diff --git a/guide/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala b/guide/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala
@@ -17,7 +17,7 @@ class BootstrappingFrontendView extends FinalView {
   import Context._
 
   import JsDom.all._
-  import scalacss.Defaults._
+  import scalacss.ProdDefaults._
   import scalacss.ScalatagsCss._
 
   override def getTemplate: Modifier = div(

diff --git a/guide/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala b/guide/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala
@@ -14,7 +14,7 @@ class BootstrappingIntroView extends FinalView {
   import Context._
 
   import JsDom.all._
-  import scalacss.Defaults._
+  import scalacss.ProdDefaults._
   import scalacss.ScalatagsCss._
 
   override def getTemplate: Modifier = div(

diff --git a/guide/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala b/guide/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala
@@ -18,7 +18,7 @@ case object BootstrapExtViewPresenter extends DefaultViewPresenterFactory[Bootst
 class BootstrapExtView extends FinalView {
   import JsDom.all._
   import scalacss.ScalatagsCss._
-  import scalacss.Defaults._
+  import scalacss.ProdDefaults._
 
   override def getTemplate: Modifier = div(
     h1("Udash Bootstrap Components"),

diff --git a/guide/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala b/guide/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala
@@ -14,7 +14,7 @@ import org.scalajs.dom.raw.HTMLStyleElement
 
 import scala.concurrent.duration.FiniteDuration
 import scalacss.internal.{AV, Keyframes}
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 import scalatags.JsDom
 import scalatags.JsDom.TypedTag
 

diff --git a/guide/src/main/scala/io/udash/web/guide/views/rest/demos/SimpleRestDemoComponent.scala b/guide/src/main/scala/io/udash/web/guide/views/rest/demos/SimpleRestDemoComponent.scala
@@ -71,7 +71,7 @@ class SimpleRestDemoComponent extends Component {
 
   class SimpleRestDemoView(model: ModelProperty[ExampleModel], presenter: SimpleRestDemoPresenter) {
     import JsDom.all._
-    import scalacss.Defaults._
+    import scalacss.ProdDefaults._
     import scalacss.ScalatagsCss._
 
     val loadStringButton = UdashButton(

diff --git a/homepage/src/main/scala/io/udash/web/homepage/styles/HomepageDefaultStyles.scala b/homepage/src/main/scala/io/udash/web/homepage/styles/HomepageDefaultStyles.scala
@@ -4,7 +4,7 @@ import io.udash.web.commons.styles.{DefaultStyles, UdashStylesheet}
 import io.udash.web.commons.styles.utils._
 
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object HomepageDefaultStyles extends UdashStylesheet with DefaultStyles {
   import dsl._

diff --git a/homepage/src/main/scala/io/udash/web/homepage/styles/partials/ButtonsStyle.scala b/homepage/src/main/scala/io/udash/web/homepage/styles/partials/ButtonsStyle.scala
@@ -7,7 +7,7 @@ import io.udash.web.commons.styles.utils._
 
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object ButtonsStyle extends UdashStylesheet {
   import dsl._

diff --git a/homepage/src/main/scala/io/udash/web/homepage/styles/partials/DemoStyles.scala b/homepage/src/main/scala/io/udash/web/homepage/styles/partials/DemoStyles.scala
@@ -7,7 +7,7 @@ import io.udash.web.homepage.components.demo.DemoComponent
 
 import scala.language.postfixOps
 import scalacss.internal.Compose
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object DemoStyles extends UdashStylesheet {
   import dsl._

diff --git a/homepage/src/main/scala/io/udash/web/homepage/styles/partials/HeaderStyles.scala b/homepage/src/main/scala/io/udash/web/homepage/styles/partials/HeaderStyles.scala
@@ -10,7 +10,7 @@ import io.udash.web.commons.styles.utils.{MediaQueries, StyleConstants, StyleUti
 
 import scala.concurrent.duration.FiniteDuration
 import scala.language.postfixOps
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object HeaderStyles extends UdashStylesheet with HeaderButtonsStyles with HeaderNavStyles {
   import dsl._

diff --git a/homepage/src/main/scala/io/udash/web/homepage/styles/partials/HomepageStyles.scala b/homepage/src/main/scala/io/udash/web/homepage/styles/partials/HomepageStyles.scala
@@ -6,7 +6,7 @@ import io.udash.web.commons.styles.utils._
 
 import scala.language.postfixOps
 import scalacss.internal.Compose
-import scalacss.Defaults._
+import scalacss.ProdDefaults._
 
 object HomepageStyles extends UdashStylesheet with CodeBlockStyles {
   import dsl._

diff --git a/homepage/src/main/scala/io/udash/web/homepage/views/RootView.scala b/homepage/src/main/scala/io/udash/web/homepage/views/RootView.scala
@@ -18,7 +18,7 @@ import scalatags.JsDom.tags2._
 object RootViewPresenter extends DefaultViewPresenterFactory[RootState.type](() => new RootView)
 
 class RootView extends View {
-  import scalacss.Defaults._
+  import scalacss.ProdDefaults._
   import scalacss.ScalatagsCss._
   import scalatags.JsDom.all._
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,16 +6,16 @@ object Dependencies {
   val versionOfScala = "2.12.2"
   val jettyVersion = "9.3.11.v20160721"
 
-  val udashVersion = "0.5.0-RC.3"
+  val udashVersion = "0.5.0"
   val udashJQueryVersion = "1.0.1"
   val highchartsVarsion = "5.0.10"
 
-  val scalaCssVersion = "0.5.3-RC1"
+  val scalaCssVersion = "0.5.3"
 
   val scalaLoggingVersion = "3.5.0"
   val logbackVersion = "1.2.3"
 
-  val avsystemCommonsVersion = "1.20.2"
+  val avsystemCommonsVersion = "1.20.3"
   val typesafeConfigVersion = "1.3.1"
   val springVersion = "4.3.8.RELEASE"
   val akkaVersion = "2.4.17"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 0.13.15
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
 
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"