Skip to content

Commit

Permalink
Cross-build chill-avro against Scala 2.13 too (#704)
Browse files Browse the repository at this point in the history
  • Loading branch information
hygt authored Sep 30, 2022
1 parent 0d1b2a8 commit 31b77d6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- "11"
scala:
- "2.11.12"
- "2.12.16"
- "2.12.17"
test:
runs-on: ubuntu-latest
steps:
Expand All @@ -49,7 +49,7 @@ jobs:
- "8"
- "11"
scala:
- "2.12.16"
- "2.12.17"
- "2.13.8"
testWithCoverageReport:
runs-on: ubuntu-latest
Expand Down
7 changes: 1 addition & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def scalaVersionSpecificFolders(srcBaseDir: java.io.File, scalaVersion: String):
val sharedSettings = mimaDefaultSettings ++ Seq(
organization := "com.twitter",
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.16"),
crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.8"),
scalacOptions ++= Seq("-unchecked", "-deprecation"),
scalacOptions ++= {
scalaVersion.value match {
Expand Down Expand Up @@ -167,7 +167,6 @@ lazy val chill = Project(
).settings(sharedSettings)
.settings(
name := "chill",
crossScalaVersions += "2.13.8",
mimaPreviousArtifacts := Set("com.twitter" %% "chill" % binaryCompatVersion),
mimaBinaryIssueFilters ++= ignoredABIProblems,
libraryDependencies += "org.apache.xbean" % "xbean-asm7-shaded" % asmVersion
Expand All @@ -182,7 +181,6 @@ def akka(scalaVersion: String) =

lazy val chillAkka = module("akka")
.settings(
crossScalaVersions += "2.13.8",
resolvers += Resolver.typesafeRepo("releases"),
libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.4.2",
Expand All @@ -193,7 +191,6 @@ lazy val chillAkka = module("akka")

lazy val chillBijection = module("bijection")
.settings(
crossScalaVersions += "2.13.8",
libraryDependencies ++= Seq(
"com.twitter" %% "bijection-core" % bijectionVersion
)
Expand Down Expand Up @@ -239,7 +236,6 @@ lazy val chillThrift = module("thrift").settings(

lazy val chillScrooge = module("scrooge")
.settings(
crossScalaVersions += "2.13.8",
libraryDependencies ++= Seq(
("org.apache.thrift" % "libthrift" % "0.16.0").exclude("junit", "junit"),
"com.twitter" %% "scrooge-serializer" % scroogeVersion
Expand Down Expand Up @@ -270,7 +266,6 @@ lazy val chillAvro = module("avro")

lazy val chillAlgebird = module("algebird")
.settings(
crossScalaVersions += "2.13.8",
libraryDependencies ++= Seq(
"com.twitter" %% "algebird-core" % algebirdVersion
)
Expand Down

0 comments on commit 31b77d6

Please sign in to comment.