@@ -78,12 +78,13 @@ vars: {
78
78
sbt-testng-interface-ref : "SethTisue/sbt-testng-interface.git#no-bintray"
79
79
80
80
// tracking upstream (the ideal)
81
- akka-ref : "adriaanm /akka.git#sam240 "
81
+ akka-ref : "akka /akka.git#master "
82
82
async-ref : "scala/async.git"
83
83
scala-continuations-ref : "scala/scala-continuations.git"
84
84
scala-parser-combinators-ref : "scala/scala-parser-combinators.git"
85
85
scala-partest-ref : "scala/scala-partest.git"
86
86
scala-partest-interface-ref : "scala/scala-partest-interface.git"
87
+ scala-java8-compat-ref : "szeiger/scala-java8-compat.git#wip/scala-2.12.0-rc1-compat"
87
88
scala-xml-ref : "scala/scala-xml.git"
88
89
scala-swing-ref : "adriaanm/scala-swing.git#2.0.x"
89
90
scala-records-ref : "scala-records/scala-records.git"
@@ -207,7 +208,7 @@ options.cleanup: {
207
208
}
208
209
209
210
// Topological sort of projects:
210
- // No deps: browse, slick, genjavadoc-plugin, scala-js, scala-swing, scala-partest-interface, async, scalacheck, shapeless
211
+ // No deps: browse, slick, genjavadoc-plugin, scala-js, scala-swing, scala-partest-interface, async, scalacheck, shapeless, scala-java8-compat
211
212
//
212
213
// *depends* on scalacheck: scalaz, sbinary, scala-partest, scalatest
213
214
// *depends* on scalatest: scodec-bits, scala-records, genjavadoc, scala-stm
@@ -250,6 +251,14 @@ build += {
250
251
extra.run-tests: false // TODO enable tests
251
252
}
252
253
254
+ ${vars.base} {
255
+ name: "scala-java8-compat",
256
+ uri: "https://github.com/"${vars.scala-java8-compat-ref}
257
+ // For some reason dbuild includes test sources in the javadocs, which trips up javadoc because
258
+ // we use "assert" as an identifier there. We disable doc building to avoid that.
259
+ extra.commands: ${vars.default-commands} [ "set publishArtifact in packageDoc := false" ]
260
+ }
261
+
253
262
${vars.base} {
254
263
name: scalaz
255
264
uri: "https://github.com/"${vars.scalaz-ref}
@@ -348,6 +357,16 @@ build += {
348
357
// to get the JMH dependency. - ST 8/17/15
349
358
projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"]
350
359
run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15
360
+ commands: ${vars.default-commands} [
361
+ // Don't build akka-remote-tests/test scope because it requires ScalaTest 3.0
362
+ "set sources in (LocalProject(\"akka-remote-tests\"), Test) := Nil"
363
+ // Don't build akka-persistence-tck because it requires Scalactic (which comes as a dependency of ScalaTest 3.0)
364
+ "set sources in (LocalProject(\"akka-persistence-tck\"), Compile) := Nil"
365
+ "set sources in (LocalProject(\"akka-persistence-tck\"), Test) := Nil"
366
+ // Don't build multi-jvm tests because they require akka-remote-tests and ScalaTest 3.0
367
+ "set sources in (LocalProject(\"akka-remote-tests\"), config(\"multi-jvm\")) := Nil"
368
+ "set sources in (LocalProject(\"akka-cluster\"), config(\"multi-jvm\")) := Nil"
369
+ ]
351
370
}
352
371
}
353
372
0 commit comments