Update to Scala.js 0.5.5 / Scala 2.11.2

greencatsoft · Oct 4, 2014 · 87ddd0c · 87ddd0c
1 parent c35587b
commit 87ddd0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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