Permalink
Browse files

version upgraded to 0.18. Fixed a bug with Java class names for Scala…

… case objects - now cross compiles in 2.9.1 and 2.9.2. Last release before 2.10
  • Loading branch information...
1 parent cf15a99 commit f35fd9ca9752aaa1f9313726f306d88fc6088337 @debasishg committed Nov 13, 2012
@@ -7,18 +7,19 @@ object SJsonProject extends Build
lazy val commonSettings: Seq[Setting[_]] = Seq(
organization := "net.debasishg",
- version := "0.17",
- scalaVersion := "2.9.1",
+ version := "0.18",
+ scalaVersion := "2.9.2",
+ crossScalaVersions := Seq("2.9.2", "2.9.1"),
scalacOptions ++= Seq("-deprecation", "-unchecked")
)
lazy val coreSettings = commonSettings ++ template ++ Seq(
name := "sjson",
- libraryDependencies ++= Seq("net.databinder" % "dispatch-json_2.9.1" % "0.8.5",
+ libraryDependencies ++= Seq("net.databinder" % "dispatch-json_2.9.2" % "0.8.8",
"commons-io" % "commons-io" % "1.4",
"org.objenesis" % "objenesis" % "1.2",
"junit" % "junit" % "4.8.1" % "test",
- "org.scalatest" % "scalatest_2.9.1" % "1.6.1" % "test"),
+ "org.scalatest" % "scalatest_2.9.2" % "2.0.M4" % "test"),
parallelExecution in Test := false,
publishTo <<= version { (v: String) =>
val nexus = "https://oss.sonatype.org/"
@@ -1 +1 @@
-sbt.version=0.11.2
+sbt.version=0.12.1
View
@@ -1,7 +1,15 @@
resolvers += "web-plugin.repo" at "http://siasia.github.com/maven2"
-libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.10"))
+libraryDependencies <+= sbtVersion(v => v match {
+case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
+case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
+case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
+case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
+case x if (x.startsWith("0.12")) => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
+})
resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
-addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.5")
+addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
+
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
@@ -420,7 +420,9 @@ trait JsBean {
"{" + toJSON(t._1) + ":" + toJSON(t._2) + "}"
// scala case object
- case x if x.getClass.getName.endsWith("$") => quote(obj.getClass.getCanonicalName)
+ case x if x.getClass.getName.endsWith("$") => {
+ quote(obj.getClass.getName)
+ }
case _ => {
// handle beans
@@ -1,7 +1,7 @@
package sjson
package json
-import org.scalatest.Spec
+import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ import TestBeans._
@RunWith(classOf[JUnitRunner])
-class JsonSpec extends Spec with ShouldMatchers {
+class JsonSpec extends FunSpec with ShouldMatchers {
import dispatch.json._
import Js._
@@ -2,7 +2,7 @@ package sjson
package json
import java.util.TimeZone
-import org.scalatest.Spec
+import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ import scala.reflect.BeanInfo
import TestBeans._
@RunWith(classOf[JUnitRunner])
-class SerializerSpec extends Spec with ShouldMatchers {
+class SerializerSpec extends FunSpec with ShouldMatchers {
import dispatch.json._
import Js._
@@ -1,13 +1,13 @@
package sjson
package json
-import org.scalatest.Spec
+import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
@RunWith(classOf[JUnitRunner])
-class TypeclassSerializerSpec extends Spec with ShouldMatchers {
+class TypeclassSerializerSpec extends FunSpec with ShouldMatchers {
import DefaultProtocol._
import JsonSerialization._

0 comments on commit f35fd9c

Please sign in to comment.