Update scalariform (#23778) (#23783)

This commit is contained in:
Arnout Engelen 2017-10-06 10:30:28 +02:00 committed by GitHub
parent 63ccdeec16
commit b1df13d4d4
221 changed files with 1528 additions and 1580 deletions

View file

@ -9,7 +9,7 @@ import sbt.Keys._
object Jdk9CompileDirectoriesPlugin extends AutoPlugin {
val jdkVersion: String = System.getProperty("java.version")
override def trigger = allRequirements
override lazy val projectSettings = Seq(
@ -19,27 +19,23 @@ object Jdk9CompileDirectoriesPlugin extends AutoPlugin {
if (isJDK9) Seq("-target", "1.8", "-source", "1.8", "-Xdoclint:none")
else Seq("-Xdoclint:none")
},
unmanagedSourceDirectories in Compile ++= {
if (isJDK9) {
println(s"[JDK9] Enabled [...-jdk9-only] directories to be compiled.")
Seq(
(sourceDirectory in Compile).value / "java-jdk9-only",
(sourceDirectory in Compile).value / "scala-jdk9-only"
)
(sourceDirectory in Compile).value / "scala-jdk9-only")
} else Seq.empty
},
unmanagedSourceDirectories in Test ++= {
if (isJDK9) {
Seq(
(sourceDirectory in Test).value / "java-jdk9-only",
(sourceDirectory in Test).value / "scala-jdk9-only"
)
(sourceDirectory in Test).value / "scala-jdk9-only")
} else Seq.empty
}
)
})
private def isJDK9 = {
jdkVersion startsWith "9"