From e8117e273b1d57f2d31d43e58e190dda1cf2a025 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 1 Dec 2016 22:47:13 -0800 Subject: Upgrade versions --- project/Dependencies.scala | 4 ++-- project/FlowBuild.scala | 2 +- project/build.properties | 2 +- project/plugins.sbt | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 527d911..b697f6d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,8 +4,8 @@ import sbt._ object Dependencies { - val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.11" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.14" - val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.11" + val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.14" } diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index f7f652a..dcd4cdd 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -5,7 +5,7 @@ import Keys._ object FlowBuild extends Build { - val scalaVersions = List("2.11.8", "2.12.0-RC1") + val scalaVersions = List("2.11.8", "2.12.0") lazy val commonSettings: Seq[Setting[_]] = Seq( resolvers += Resolver.jcenterRepo, diff --git a/project/build.properties b/project/build.properties index 35c88ba..27e88aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version=0.13.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index 3c53cfd..3db4586 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,10 +2,8 @@ * Main plugins */ -resolvers += Resolver.jcenterRepo - // Build, package and load native libraries -addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.2.1") +addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.2.4") /* * Utility plugins, can be disabled during plain build -- cgit v1.2.3