Skip to content

Commit

Permalink
Upgrading to latest Scala.js
Browse files Browse the repository at this point in the history
  • Loading branch information
fancellu committed Sep 24, 2016
1 parent 6927627 commit 399bd7b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ language: scala
script:
- sbt fullOptJS
scala:
- 2.11.7
- 2.11.8
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ workbenchSettings

name := "Scala.js+Vue.js example"

version := "0.1"
version := "0.2"

scalaVersion := "2.11.7"
scalaVersion := "2.11.8"

libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "0.8.1"
"org.scala-js" %%% "scalajs-dom" % "0.9.1"
)

bootSnippet := "example.T1().main(document.getElementById('mydiv'));"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")

addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.3")
3 changes: 2 additions & 1 deletion src/main/scala/example/Todo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import dom.ext.Ajax
import scalajs.js
import js.Dynamic.literal
import com.felstar.scalajs.vue._
import js.annotation.JSName

@JSExport
object Todo extends {
Expand All @@ -27,7 +28,7 @@ object Todo extends {
var done:Boolean=js.native
var content:String=js.native
}
@js.native

object DemoVueTodo{
def apply(done:Boolean,content:String)=literal(done=done,content=content).asInstanceOf[DemoVueTodo]
}
Expand Down

0 comments on commit 399bd7b

Please sign in to comment.