Skip to content

Commit 6d4348d

Browse files
committed
Just don't run mima for 2.12
1 parent 2d9f9d9 commit 6d4348d

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ matrix:
1313

1414
- scala: 2.12.1
1515
jdk: oraclejdk8
16-
script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "+++$TRAVIS_SCALA_VERSION doc"
16+
#script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "+++$TRAVIS_SCALA_VERSION doc"
17+
script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION doc"
1718

1819
cache:
1920
directories:

build.sbt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,15 @@ val unreleasedModules = Set[String]("akka")
126126
val javaOnly = Set[String]("storm", "java", "hadoop", "thrift", "protobuf")
127127
val binaryCompatVersion = "0.8.1"
128128

129-
def youngestForwardCompatible(subProj: String, scalaver: String) =
129+
def youngestForwardCompatible(subProj: String) =
130130
Some(subProj)
131131
.filterNot(unreleasedModules.contains(_))
132132
.map { s =>
133-
if (javaOnly.contains(s))
134-
"com.twitter" % ("chill-" + s) % binaryCompatVersion
135-
else
136-
"com.twitter" %% ("chill-" + s) % binaryCompatVersion
137-
}
138-
.filterNot(_ => scalaver.startsWith("2.12")) // 2.12 0.8.1 was not there
133+
if (javaOnly.contains(s))
134+
"com.twitter" % ("chill-" + s) % binaryCompatVersion
135+
else
136+
"com.twitter" %% ("chill-" + s) % binaryCompatVersion
137+
}
139138

140139
val ignoredABIProblems = {
141140
import com.typesafe.tools.mima.core._
@@ -149,7 +148,7 @@ def module(name: String) = {
149148
val id = "chill-%s".format(name)
150149
Project(id = id, base = file(id), settings = sharedSettings ++ Seq(
151150
Keys.name := id,
152-
mimaPreviousArtifacts := youngestForwardCompatible(name, scalaVersion.value).toSet,
151+
mimaPreviousArtifacts := youngestForwardCompatible(name).toSet,
153152
mimaBinaryIssueFilters ++= ignoredABIProblems,
154153
// Disable cross publishing for java artifacts
155154
publishArtifact :=

0 commit comments

Comments
 (0)