@@ -4,11 +4,11 @@ import sbtrelease.ReleaseStateTransformations._
44val kryoVersion = " 4.0.0"
55val bijectionVersion = " 0.9.4"
66val algebirdVersion = " 0.12.0"
7- val akkaVersion = " 2.3.6 "
7+ val akkaVersion = " 2.4.16 "
88
99val sharedSettings = mimaDefaultSettings ++ scalariformSettings ++ Seq (
1010 organization := " com.twitter" ,
11- scalaVersion := " 2.11.8 " ,
11+ scalaVersion := " 2.12.1 " ,
1212 crossScalaVersions := Seq (" 2.10.6" , " 2.11.8" , " 2.12.1" ),
1313 scalacOptions ++= Seq (" -unchecked" , " -deprecation" ),
1414 ScalariformKeys .preferences := formattingPreferences,
@@ -167,12 +167,17 @@ lazy val chill = Project(
167167 mimaPreviousArtifacts := Set (" com.twitter" %% " chill" % binaryCompatVersion)
168168).dependsOn(chillJava)
169169
170+ def akka (scalaVersion : String ) =
171+ (scalaVersion match {
172+ case " 2.10.6" => " com.typesafe.akka" %% " akka-actor" % " 2.3.16"
173+ case _ => " com.typesafe.akka" %% " akka-actor" % akkaVersion
174+ }) % " provided"
175+
170176lazy val chillAkka = module(" akka" ).settings(
171177 resolvers += Resolver .typesafeRepo(" releases" ),
172- crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith(" 2.12" )),
173178 libraryDependencies ++= Seq (
174179 " com.typesafe" % " config" % " 1.2.1" ,
175- " com.typesafe.akka " %% " akka-actor " % akkaVersion % " provided "
180+ scalaVersion (sv => akka(sv)).value
176181 )
177182).dependsOn(chill % " test->test;compile->compile" )
178183
0 commit comments