Skip to content

Set "-Xdoclint:none" only when the Java is 1.8 or more #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 2 commits into from
Jan 14, 2015
Merged

Set "-Xdoclint:none" only when the Java is 1.8 or more #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59d6a4
Set "-Xdoclint:none" only when the Java is 1.8 or more
komamitsu Jan 12, 2015
8c165d2
Refactor: use scala.util.Properties.isJavaAtLeast()
komamitsu Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import de.johoop.findbugs4sbt.FindBugs._
import de.johoop.jacoco4sbt._
import JacocoPlugin._
import sbtrelease.ReleasePlugin._
import xerial.sbt.Sonatype._
import scala.util.Properties


object Build extends Build {

Expand Down Expand Up @@ -59,7 +60,13 @@ object Build extends Build {
scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"),
javaOptions in Test ++= Seq("-ea"),
javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.6", "-target", "1.6"),
javacOptions in doc := Seq("-source", "1.6", "-Xdoclint:none"),
javacOptions in doc := {
val opts = Seq("-source", "1.6")
if (Properties.isJavaAtLeast("1.8"))
opts ++ Seq("-Xdoclint:none")
else
opts
},
findbugsReportType := Some(ReportType.FancyHtml),
findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"),
pomExtra := {
Expand Down