From 17eafffab88e93638f660dfa544a9c32fea88a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Antonsson?= Date: Thu, 27 Oct 2016 13:02:23 +0200 Subject: [PATCH] Make the akka-scala-nightly project work as expected * Added new scala-java8-compat version for Scala 2.12.0-RC2+ * Fixed a diff between ProjectRef and Project that never matched --- project/AkkaBuild.scala | 2 +- project/Dependencies.scala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 00403ef7d4..af6943bb83 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -95,7 +95,7 @@ object AkkaBuild extends Build { base = file("akka-scala-nightly"), // remove dependencies that we have to build ourselves (Scala STM) // 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) lazy val actor = Project( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a3bb67d721..71b31d6691 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,6 +29,7 @@ object Dependencies { java8CompatVersion := { scalaVersion.value match { 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" } }