From 87ddd0c05d565e77906d13eec8e7d767cf09cb18 Mon Sep 17 00:00:00 2001 From: Xavier Cho Date: Sat, 4 Oct 2014 16:50:37 +0900 Subject: [PATCH] Update to Scala.js 0.5.5 / Scala 2.11.2 --- build.sbt | 2 +- project/plugins.sbt | 2 +- .../com/greencatsoft/angularjs/i18next/NamespaceConfig.scala | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ece39bf..7000d0b 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ organization := "com.greencatsoft" version := "0.2-SNAPSHOT" -scalaVersion := "2.11.1" +scalaVersion := "2.11.2" scalacOptions ++= Seq("-feature","-deprecation") diff --git a/project/plugins.sbt b/project/plugins.sbt index 494435d..949abdc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.4") +addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.5.0") diff --git a/src/main/scala/com/greencatsoft/angularjs/i18next/NamespaceConfig.scala b/src/main/scala/com/greencatsoft/angularjs/i18next/NamespaceConfig.scala index 0ca1e04..a9125f8 100644 --- a/src/main/scala/com/greencatsoft/angularjs/i18next/NamespaceConfig.scala +++ b/src/main/scala/com/greencatsoft/angularjs/i18next/NamespaceConfig.scala @@ -1,6 +1,7 @@ package com.greencatsoft.angularjs.i18next import scala.scalajs.js +import scala.scalajs.js.JSConverters.array2JSRichGenTrav trait NamespaceConfig extends js.Object { @@ -22,7 +23,7 @@ object NamespaceConfig { val config = new js.Object().asInstanceOf[NamespaceConfig] - config.namespaces = namespaces + config.namespaces = namespaces.toJSArray config.defaultNs = defaultNs.getOrElse(namespaces(0)) config