Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala versions 2.11.12 and 2.12.8 #326

Merged
merged 2 commits into from
Oct 14, 2019
Merged

Update scala versions 2.11.12 and 2.12.8 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73dc849
Update scala versions
regadas Oct 11, 2019
f08442f
Ignore MiMa false positives
regadas Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ language: scala
sudo: false
matrix:
include:
- scala: 2.11.8
- scala: 2.11.12
jdk: openjdk8
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test

- scala: 2.12.1
- scala: 2.12.8
jdk: openjdk8
script: ./sbt ++$TRAVIS_SCALA_VERSION clean coverage scalafmtCheck test:scalafmtCheck test coverageReport mimaReportBinaryIssues
after_success:
Expand Down
13 changes: 10 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ def scroogeSerializer = {

val buildLevelSettings = Seq(
organization := "com.twitter",
crossScalaVersions := Seq("2.11.8", "2.12.1"),
crossScalaVersions := Seq("2.11.12", scalaVersion.value),
javacOptions ++= Seq("-source", "1.6", "-target", "1.6"),
javacOptions in doc := Seq("-source", "1.6"),
scalaVersion := "2.12.1",
javacOptions in doc := Seq("-source", "1.6", "-Xlint:deprecation",
"-Xlint:unchecked"),
scalaVersion := "2.12.8",
scalacOptions ++= Seq(
"-unchecked",
"-deprecation",
Expand Down Expand Up @@ -143,6 +144,12 @@ val ignoredABIProblems = {
),
exclude[ReversedMissingMethodProblem](
"com.twitter.bijection.twitter_util.UtilBijections.twitter2JavaFutureInjection"
),
exclude[DirectMissingMethodProblem](
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MiMa false positives related to lightbend-labs/mima#388

"com.twitter.bijection.netty.ChannelBufferBijection.invert"
),
exclude[DirectMissingMethodProblem](
"com.twitter.bijection.Bijection.trav2Vector"
)
)
}
Expand Down