Skip to content

Commit fdbdb02

Browse files
authored
Bump scrooge 2.12 (#279)
* Bump scrooge 2.12 * fix 2.10 build
1 parent 08791f6 commit fdbdb02

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

build.sbt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
22
import sbtrelease.ReleaseStateTransformations._
33

4-
val kryoVersion = "4.0.0"
5-
val bijectionVersion = "0.9.4"
6-
val algebirdVersion = "0.12.0"
74
val akkaVersion = "2.4.16"
5+
val algebirdVersion = "0.12.0"
6+
val bijectionVersion = "0.9.4"
7+
val kryoVersion = "4.0.0"
8+
val scroogeVersion = "4.12.0"
89

910
val sharedSettings = mimaDefaultSettings ++ scalariformSettings ++ Seq(
1011
organization := "com.twitter",
@@ -169,10 +170,18 @@ lazy val chill = Project(
169170

170171
def akka(scalaVersion: String) =
171172
(scalaVersion match {
172-
case "2.10.6" => "com.typesafe.akka" %% "akka-actor" % "2.3.16"
173+
case s if s.startsWith("2.10.") => "com.typesafe.akka" %% "akka-actor" % "2.3.16"
173174
case _ => "com.typesafe.akka" %% "akka-actor" % akkaVersion
174175
}) % "provided"
175176

177+
def scrooge(scalaVersion: String) = {
178+
val scroogeBase = "com.twitter" %% "scrooge-serializer"
179+
scalaVersion match {
180+
case s if s.startsWith("2.10.") => scroogeBase % "4.7.0" // the last 2.10 version
181+
case _ => scroogeBase % scroogeVersion
182+
}
183+
}
184+
176185
lazy val chillAkka = module("akka").settings(
177186
resolvers += Resolver.typesafeRepo("releases"),
178187
libraryDependencies ++= Seq(
@@ -221,10 +230,9 @@ lazy val chillThrift = module("thrift").settings(
221230
)
222231

223232
lazy val chillScrooge = module("scrooge").settings(
224-
crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
225233
libraryDependencies ++= Seq(
226234
"org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit"),
227-
"com.twitter" %% "scrooge-serializer" % "3.20.0"
235+
scalaVersion (sv => scrooge(sv)).value
228236
)
229237
).dependsOn(chill % "test->test;compile->compile")
230238

0 commit comments

Comments
 (0)