Merge branch 'develop' into release/0.17.0

twitter · Apr 11, 2017 · d46959f · d46959f
2 parents d689e97 + 73c2e69
commit d46959f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/build.sbt b/build.sbt
@@ -102,6 +102,11 @@ val sharedSettings = assemblySettings ++ scalariformSettings ++ Seq(
       "-language:existentials"
     ),
 
+  scalacOptions in(Compile, doc) ++= Seq(scalaVersion.value).flatMap {
+    case v if v.startsWith("2.12") => Seq("-no-java-comments") //workaround for scala/scala-dev#249
+    case _ => Seq()
+  },
+
   /**
    * add linter for common scala issues:
    * https://github.com/HairyFotr/linter