Merge pull request #53 from xuwei-k/java7

target java7
scalapb · Nov 7, 2015 · 03dedf2 · 03dedf2
2 parents f01b90f + 1fad710
commit 03dedf2
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,19 @@ scalaVersion in ThisBuild := "2.11.7"
 
 crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.7", "2.12.0-M1")
 
-scalacOptions in ThisBuild += "-target:jvm-1.7"
+scalacOptions in ThisBuild ++= {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, v)) if v <= 11 => List("-target:jvm-1.7")
+    case _ => Nil
+  }
+}
+
+javacOptions in ThisBuild ++= {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, v)) if v <= 11 => List("-target", "7", "-source", "7")
+    case _ => Nil
+  }
+}
 
 organization in ThisBuild := "com.trueaccord.scalapb"