@@ -68,9 +68,10 @@ lazy val root = (project in file(".")).
6868 (out ** " *.scala" ).get
6969 }.taskValue,
7070
71- sourceGenerators in Compile <+= (sourceManaged in Compile , scalaVersion) map { (dir, v) =>
71+ sourceGenerators in Compile += Def .task {
72+ val dir = (sourceManaged in Compile ).value
7273 val write = jwrite(dir) _
73- if (v .startsWith(" 2.11." )) {
74+ if (scalaVersion.value .startsWith(" 2.11." )) {
7475 Seq (write(" JFunction" , CodeGen .factory)) ++
7576 (0 to 22 ).map(n => write(" JFunction" + n, CodeGen .fN(n))) ++
7677 (0 to 22 ).map(n => write(" JProcedure" + n, CodeGen .pN(n))) ++
@@ -79,11 +80,11 @@ lazy val root = (project in file(".")).
7980 CodeGen .specializedF2.map(write.tupled) ++
8081 CodeGen .packageDummy.map((jwrite(dir, " java/runtime/java8" ) _).tupled)
8182 } else CodeGen .create212.map(write.tupled)
82- },
83+ }.taskValue ,
8384
84- sourceGenerators in Test < += sourceManaged in Test map { dir =>
85- Seq (jwrite(dir )(" TestApi" , CodeGen .testApi))
86- },
85+ sourceGenerators in Test += Def .task {
86+ Seq (jwrite((sourceManaged in Test ).value )(" TestApi" , CodeGen .testApi))
87+ }.taskValue ,
8788
8889 initialize := {
8990 // Run previously configured inialization...
@@ -103,9 +104,11 @@ lazy val root = (project in file(".")).
103104 ).
104105 settings(
105106 (inConfig(JavaDoc )(Defaults .configSettings) ++ (if (disableDocs) Nil else Seq (
106- packageDoc in Compile <<= packageDoc in JavaDoc ,
107- sources in JavaDoc <<= (target, compile in Compile , sources in Compile ) map {(t, c, s) =>
108- val allJavaSources = (t / " java" ** " *.java" ).get ++ s.filter(_.getName.endsWith(" .java" ))
107+ packageDoc in Compile := (packageDoc in JavaDoc ).value,
108+ sources in JavaDoc := {
109+ val allJavaSources =
110+ (target.value / " java" ** " *.java" ).get ++
111+ (sources in Compile ).value.filter(_.getName.endsWith(" .java" ))
109112 allJavaSources.filterNot(_.getName.contains(" FuturesConvertersImpl.java" )) // this file triggers bugs in genjavadoc
110113 },
111114 javacOptions in JavaDoc := Seq (),
0 commit comments