Skip to content

Commit 08fad19

Browse files
Piyush Narangjohnynek
authored andcommitted
Pick up Scrooge, Algebird and Storm version commits to 0.7.x (#285)
* Upgrade to Storm API 1.0.2 (#269) * Bump scrooge 2.12 (#279) * Bump scrooge 2.12 * fix 2.10 build * Bump algebird to enable 2.12 cross build. (#281) * Bump algebird to enable 2.12 cross build. * Bump algebird to 0.13.0. * Revert "Upgrade to Storm API 1.0.2 (#269)" This reverts commit 6b80320.
1 parent 0254713 commit 08fad19

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

build.sbt

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

44
val kryoVersion = "2.21"
5-
val bijectionVersion = "0.9.4"
6-
val algebirdVersion = "0.12.0"
75
val akkaVersion = "2.4.16"
6+
val algebirdVersion = "0.13.0"
7+
val bijectionVersion = "0.9.4"
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(
@@ -225,10 +234,9 @@ lazy val chillThrift = module("thrift").settings(
225234
)
226235

227236
lazy val chillScrooge = module("scrooge").settings(
228-
crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
229237
libraryDependencies ++= Seq(
230238
"org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit"),
231-
"com.twitter" %% "scrooge-serializer" % "3.20.0"
239+
scalaVersion (sv => scrooge(sv)).value
232240
)
233241
).dependsOn(chill % "test->test;compile->compile")
234242

@@ -249,7 +257,6 @@ lazy val chillAvro = module("avro").settings(
249257
).dependsOn(chill,chillJava, chillBijection)
250258

251259
lazy val chillAlgebird = module("algebird").settings(
252-
crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
253260
libraryDependencies ++= Seq(
254261
"com.twitter" %% "algebird-core" % algebirdVersion
255262
)

0 commit comments

Comments
 (0)