Skip to content

Commit 5436f2a

Browse files
authored
Merge pull request #453 from dwijnand/release-prep
Release prep, restore sbt 1.2.8 support & drop scala-collection-compat
2 parents 63596d8 + fd30a83 commit 5436f2a

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ scala: 2.12.10
44

55
jobs:
66
include:
7-
- { script: sbt mimaReportBinaryIssues test IntegrationTest/test }
7+
- { script: "sbt mimaReportBinaryIssues test IntegrationTest/test
8+
'set sbtplugin/scriptedSbt := \"1.2.8\"' 'scripted sbt-mima-plugin/minimal'" }
89
- { name: testFunctional 2.11, script: sbt -Dmima.testScalaVersion=2.11.12 testFunctional }
910
- { name: testFunctional 2.12, script: sbt -Dmima.testScalaVersion=2.12.10 testFunctional }
1011
- { name: testFunctional 2.13, script: sbt -Dmima.testScalaVersion=2.13.1 testFunctional }

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@ source compatibility.
3636

3737
## Usage
3838

39-
The latest version of MiMa's sbt plugin supports sbt 1.3.0+.
40-
Use v0.6.0 for sbt 1.0.x - 1.2.x, and v0.3.0 for sbt 0.13.x.
39+
MiMa's sbt plugin supports sbt 1.x only. Use v0.3.0 for sbt 0.13.x.
4140

4241
To use it add the following to your `project/plugins.sbt` file:
4342

4443
```
45-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
44+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.2")
4645
```
4746

4847
Add the following to your `build.sbt` file:

build.sbt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ val functionalTests = Project("functional-tests", file("functional-tests"))
6464
.enablePlugins(TestsPlugin)
6565
.disablePlugins(BintrayPlugin)
6666
.settings(
67-
libraryDependencies ++= Seq(
68-
"com.typesafe" % "config" % "1.4.0",
69-
"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.3",
70-
),
67+
libraryDependencies += "com.typesafe" % "config" % "1.4.0",
7168
mimaFailOnNoPrevious := false,
7269
skip in publish := true,
7370
)

functional-tests/src/main/scala/com/typesafe/tools/mima/lib/ProblemFiltersConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package lib
33

44
import com.typesafe.tools.mima.core.{ProblemFilter, ProblemFilters}
55
import com.typesafe.config._
6-
import scala.jdk.CollectionConverters._
6+
import scala.collection.JavaConverters._
77

88
object ProblemFiltersConfig {
99
private val filterProblemsPath = "filter.problems"

sbtplugin/src/main/scala/com/typesafe/tools/mima/plugin/MimaKeys.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.typesafe.tools.mima
22
package plugin
33

44
import com.typesafe.tools.mima.core.{ Problem, ProblemFilter }
5-
import sbt._
5+
import sbt.{ File, ModuleID, settingKey, taskKey } // no sbt._, to avoid 1.3+ only singleFileJsonFormatter
66

77
object MimaKeys extends MimaKeys
88

0 commit comments

Comments
 (0)