Merge branch 'master' of https://github.com/qifun/json-stream-bson

qifun · Nov 28, 2014 · 137d0f3 · 137d0f3
2 parents 909f58c + 1ebe223
commit 137d0f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: scala
+
+scala:
+  - 2.10.4
+  - 2.11.2
+
+jdk:
+  - oraclejdk7
+  - openjdk7
diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,5 @@
+resolvers in ThisBuild += "Typesafe repository releases" at "http://repo.typesafe.com/typesafe/releases/"
+
 libraryDependencies += "org.scala-stm" %% "scala-stm" % "0.7"
 
 libraryDependencies += "com.qifun" %% "json-stream" % "0.2.1" % "provided"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.qifun" % "sbt-haxe" % "1.2.0")