summaryrefslogtreecommitdiff
path: root/examples/crossBuilds/simple
diff options
context:
space:
mode:
authorSébastien Doeraene <sjrdoeraene@gmail.com>2015-01-29 17:50:33 +0100
committerSébastien Doeraene <sjrdoeraene@gmail.com>2015-01-29 17:50:33 +0100
commit33129113b3ebf3dd656bd58c34af476fb852e2f6 (patch)
tree5b84193ecd9eefc05bd9f27b1766e833064182ae /examples/crossBuilds/simple
parentea067baf2afe492cde8b10b88e9628812cb4d7cd (diff)
downloadhands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.tar.gz
hands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.tar.bz2
hands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.zip
Upgrade and update the whole thing for Scala.js 0.6.0-RC2.
Both the builds, as well as the text of the book, have been completely updated for Scala.js 0.6.x.
Diffstat (limited to 'examples/crossBuilds/simple')
-rw-r--r--examples/crossBuilds/simple/build.sbt2
-rw-r--r--examples/crossBuilds/simple/project/build.properties1
-rw-r--r--examples/crossBuilds/simple/project/build.sbt2
3 files changed, 3 insertions, 2 deletions
diff --git a/examples/crossBuilds/simple/build.sbt b/examples/crossBuilds/simple/build.sbt
index f1cda7e..ce296c4 100644
--- a/examples/crossBuilds/simple/build.sbt
+++ b/examples/crossBuilds/simple/build.sbt
@@ -3,7 +3,7 @@ val sharedSettings = Seq(
baseDirectory.value / "shared" / "main" / "scala"
)
-lazy val js = project.in(file("js")).settings(scalaJSSettings:_*)
+lazy val js = project.in(file("js")).enablePlugins(ScalaJSPlugin)
.settings(sharedSettings:_*)
lazy val jvm = project.in(file("jvm")).settings(sharedSettings:_*) \ No newline at end of file
diff --git a/examples/crossBuilds/simple/project/build.properties b/examples/crossBuilds/simple/project/build.properties
new file mode 100644
index 0000000..748703f
--- /dev/null
+++ b/examples/crossBuilds/simple/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.7
diff --git a/examples/crossBuilds/simple/project/build.sbt b/examples/crossBuilds/simple/project/build.sbt
index a1dbd1d..b42401a 100644
--- a/examples/crossBuilds/simple/project/build.sbt
+++ b/examples/crossBuilds/simple/project/build.sbt
@@ -1,2 +1,2 @@
/*project/build.sbt*/
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5") \ No newline at end of file
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")