Skip to content

Commit 181ecb3

Browse files
authored
Merge pull request #262 from szeiger/wip/akka-master
Switch to Akka master branch for 2.12.x
2 parents 3a8f7b9 + f313974 commit 181ecb3

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

common.conf

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ vars: {
7878
sbt-testng-interface-ref : "SethTisue/sbt-testng-interface.git#no-bintray"
7979

8080
// tracking upstream (the ideal)
81-
akka-ref : "adriaanm/akka.git#sam240"
81+
akka-ref : "akka/akka.git#master"
8282
async-ref : "scala/async.git"
8383
scala-continuations-ref : "scala/scala-continuations.git"
8484
scala-parser-combinators-ref : "scala/scala-parser-combinators.git"
8585
scala-partest-ref : "scala/scala-partest.git"
8686
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"
8788
scala-xml-ref : "scala/scala-xml.git"
8889
scala-swing-ref : "adriaanm/scala-swing.git#2.0.x"
8990
scala-records-ref : "scala-records/scala-records.git"
@@ -207,7 +208,7 @@ options.cleanup: {
207208
}
208209

209210
// 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
211212
//
212213
// *depends* on scalacheck: scalaz, sbinary, scala-partest, scalatest
213214
// *depends* on scalatest: scodec-bits, scala-records, genjavadoc, scala-stm
@@ -250,6 +251,14 @@ build += {
250251
extra.run-tests: false // TODO enable tests
251252
}
252253

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+
253262
${vars.base} {
254263
name: scalaz
255264
uri: "https://github.com/"${vars.scalaz-ref}
@@ -348,6 +357,16 @@ build += {
348357
// to get the JMH dependency. - ST 8/17/15
349358
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"]
350359
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+
]
351370
}
352371
}
353372

0 commit comments

Comments
 (0)