Bump to 1.3.8. No code changes. Added support for Scala 2.11, reworke…

…d Build file.

README.md

@@ -5,7 +5,7 @@ Both the ScalaBuff generator and the generated Scala classes depend on Google's
 If you want to utilize ScalaBuff to generate your Scala classes from .proto sources, you'll need to either [download the source](https://github.com/SandroGrzicic/ScalaBuff/archive/master.zip) or download the packaged JAR for your Scala version from the Sonatype OSS repository. If you download the sources, you can easily run it from SBT.
 
 If you just want to use ScalaBuff-generated classes in your SBT-managed project, here's the dependency to add (located on the Sonatype OSS repository): `"net.sandrogrzicic" %% "scalabuff-runtime" % "[desired_version]"`
-The latest release is **1.3.7** with support for Scala 2.9.3, 2.10 and 2.11.0-M7.
+The latest release is **1.3.8** with support for Scala 2.9.3, 2.10 and 2.11.
 
 If you'd like to use SBT with ScalaBuff to auto-generate Scala protobuf classes from .proto sources, try the [sbt-scalabuff project](https://github.com/sbt/sbt-scalabuff).
 

project/ScalaBuffBuild.scala

@@ -22,10 +22,8 @@ object ScalaBuffBuild extends Build {
 	lazy val buildSettings = Seq(
 		name := "ScalaBuff",
 		organization := "net.sandrogrzicic",
-		version := "1.3.8-SNAPSHOT",
-		scalaVersion := "2.10.3",
-		//scalaVersion := "2.11.0-M7",
-		//scalaBinaryVersion := "2.11.0-M7",
+		version := "1.3.8",
+		scalaVersion := "2.10.4",
 		logLevel := Level.Info
 	)
 
@@ -46,15 +44,28 @@ object ScalaBuffBuild extends Build {
 		),
 
 		libraryDependencies ++= Seq(
-			"org.scalatest" %% "scalatest" % "2.0" % "test",
 			"com.google.protobuf" % "protobuf-java" % "2.5.0"
-		),
-
-		crossScalaVersions ++= Seq("2.9.3"),
-
-		scalacOptions ++= Seq("-encoding", "utf8", "-unchecked", "-deprecation", "-Xlint", "-Ywarn-all"),
-		// 2.10+ only
-		// scalacOptions ++= Seq("-Xlog-reflective-calls"),
+		) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, scalaMajor)) if scalaMajor >= 10 =>
+        Seq("org.scalatest" %% "scalatest" % "2.1.5" % "test") ++ (
+          if (scalaMajor >= 11) Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1") else Seq()
+        )
+      case Some((2, scalaMajor)) if scalaMajor == 9 =>
+        Seq("org.scalatest" %% "scalatest" % "1.9.2" % "test")
+      case _ =>
+        Seq()
+    }),
+
+		crossScalaVersions ++= Seq("2.9.3", "2.10.4", "2.11.0"),
+
+		scalacOptions ++= Seq("-encoding", "utf8", "-unchecked", "-deprecation", "-Xlint"),
+		scalacOptions ++=
+		  (CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, scalaMajor)) if scalaMajor >= 10 =>
+          Seq("-Xlog-reflective-calls")
+        case _ =>
+         Seq()
+       }),
 
 		javacOptions ++= Seq("-encoding", "utf8", "-Xlint:unchecked", "-Xlint:deprecation"),
 
@@ -71,7 +82,6 @@ object ScalaBuffBuild extends Build {
 		credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
 	) ++ sonatype.settings
 
-
 	lazy val compilerProject = Project(
 		id = "scalabuff-compiler",
 		base = file("scalabuff-compiler"),