Skip to content

Commit 0a481f4

Browse files
fkowaljohnynek
authored andcommitted
chill-akka support scala 2.12 #266 (#273)
1 parent ef8ad1c commit 0a481f4

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ matrix:
66
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test mimaReportBinaryIssues
77

88
- scala: 2.11.8
9+
jdk: oraclejdk8
910
script: ./sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport mimaReportBinaryIssues
1011
after_success:
1112
- bash <(curl -s https://codecov.io/bash)

build.sbt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import sbtrelease.ReleaseStateTransformations._
44
val kryoVersion = "4.0.0"
55
val bijectionVersion = "0.9.4"
66
val algebirdVersion = "0.12.0"
7-
val akkaVersion = "2.3.6"
7+
val akkaVersion = "2.4.16"
88

99
val 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+
170176
lazy 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

Comments
 (0)