raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #21737 from bantonsson/make-akka-scala-nightly-great-again

Browse source 
Make the akka-scala-nightly project work as expected
This commit is contained in:
Björn Antonsson 2016-10-27 17:21:47 +02:00 • committed by GitHub
commit 3e55aa5555
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/AkkaBuild.scala
View file

@ -95,7 +95,7 @@ object AkkaBuild extends Build {
base = file("akka-scala-nightly"), base = file("akka-scala-nightly"),
// remove dependencies that we have to build ourselves (Scala STM) // remove dependencies that we have to build ourselves (Scala STM)
// samples don't work with dbuild right now // samples don't work with dbuild right now
aggregate = aggregatedProjects diff List(agent, docs, samples) aggregate = aggregatedProjects diff List[ProjectReference](agent, docs, samples)
).disablePlugins(ValidatePullRequest, MimaPlugin) ).disablePlugins(ValidatePullRequest, MimaPlugin)
lazy val actor = Project( lazy val actor = Project(

1
project/Dependencies.scala
View file

@ -29,6 +29,7 @@ object Dependencies {
java8CompatVersion := { java8CompatVersion := {
scalaVersion.value match { scalaVersion.value match {
case x if x.startsWith("2.12.0-RC1") => "0.8.0-RC7" case x if x.startsWith("2.12.0-RC1") => "0.8.0-RC7"
case x if x.startsWith("2.12.0") => "0.8.0-RC8"
case _ => "0.7.0" case _ => "0.7.0"
} }
} }