Skip to content

Commit 399bd7b

Browse files
committed
Upgrading to latest Scala.js
1 parent 6927627 commit 399bd7b

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ language: scala
22
script:
33
- sbt fullOptJS
44
scala:
5-
- 2.11.7
5+
- 2.11.8

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ workbenchSettings
66

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

9-
version := "0.1"
9+
version := "0.2"
1010

11-
scalaVersion := "2.11.7"
11+
scalaVersion := "2.11.8"
1212

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

1717
bootSnippet := "example.T1().main(document.getElementById('mydiv'));"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
22

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

55
addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.3")

src/main/scala/example/Todo.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import dom.ext.Ajax
66
import scalajs.js
77
import js.Dynamic.literal
88
import com.felstar.scalajs.vue._
9+
import js.annotation.JSName
910

1011
@JSExport
1112
object Todo extends {
@@ -27,7 +28,7 @@ object Todo extends {
2728
var done:Boolean=js.native
2829
var content:String=js.native
2930
}
30-
@js.native
31+
3132
object DemoVueTodo{
3233
def apply(done:Boolean,content:String)=literal(done=done,content=content).asInstanceOf[DemoVueTodo]
3334
}

0 commit comments

Comments
 (0)