updated to latest master and pacakge layout

5 files changed, 16 insertions, 14 deletions

diff --git a/plugin/build.sbt b/plugin/build.sbt
index 72dc3e2..554cd1b 100644
--- a/plugin/build.sbt
+++ b/plugin/build.sbt
@@ -1,5 +1,6 @@
 sbtPlugin := true
 
-addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
+
+addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
 
 libraryDependencies += "commons-codec" % "commons-codec" % "1.8"
diff --git a/plugin/src/main/scala/scala/js/resource/Plugin.scala b/plugin/src/main/scala/scala/js/resource/Plugin.scala
index 933756d..f7af5e7 100644
--- a/plugin/src/main/scala/scala/js/resource/Plugin.scala
+++ b/plugin/src/main/scala/scala/js/resource/Plugin.scala
@@ -2,7 +2,7 @@ package scala.js.resource
 
 import sbt._
 import Keys._
-import ch.epfl.lamp.sbtscalajs.ScalaJSPlugin.ScalaJSKeys._
+import scala.scalajs.sbtplugin.ScalaJSPlugin.ScalaJSKeys._
 import org.apache.commons.codec.binary.Base64
 
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d872618..142a3c7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
\ No newline at end of file
+addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
\ No newline at end of file
diff --git a/runtime/project/plugins.sbt b/runtime/project/plugins.sbt
index d872618..142a3c7 100644
--- a/runtime/project/plugins.sbt
+++ b/runtime/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
\ No newline at end of file
+addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
\ No newline at end of file
diff --git a/runtime/src/main/scala/scala/js/Resource.scala b/runtime/src/main/scala/scala/js/Resource.scala
index 8cc3a49..632ebb9 100644
--- a/runtime/src/main/scala/scala/js/Resource.scala
+++ b/runtime/src/main/scala/scala/js/Resource.scala
@@ -1,11 +1,12 @@
-package scala.js
+package scala.scalajs
+package js
 
 
 object Resource {
   println("Resource")
   val fileDict = {
-    val fileDict = Dynamic.global.ScalaJS.resources.asInstanceOf[js.Object]
-    for(key <- Object.keys(fileDict)){
+    val fileDict = js.Dynamic.global.ScalaJS.resources.asInstanceOf[js.Object]
+    for(key <- js.Object.keys(fileDict)){
       val data = fileDict.asInstanceOf[js.Dictionary](key).asInstanceOf[String]
       fileDict.asInstanceOf[js.Dictionary](key) = new Resource(data).asInstanceOf[js.Any]
     }
@@ -14,16 +15,16 @@ object Resource {
 
   println("Resource Initialized")
   def apply(path: String) = {
-    Dynamic.global
-           .ScalaJS
-           .resources
-           .asInstanceOf[js.Dictionary]
-           .apply(path)
-           .asInstanceOf[scala.js.Resource]
+    js.Dynamic.global
+              .ScalaJS
+              .resources
+              .asInstanceOf[js.Dictionary]
+              .apply(path)
+              .asInstanceOf[Resource]
   }
   def create(value: String) = new Resource(value)
 }
 
 class Resource(base64: String){
-  lazy val string = Dynamic.global.atob(base64).asInstanceOf[js.String]
+  lazy val string = js.Dynamic.global.atob(base64).asInstanceOf[js.String]
 }
\ No newline at end of file