Skip to content

Commit ef4e087

Browse files
committed
Simplify TASTy-MiMa support: handle Scala 2 via tlIsScala3 and remove redundant tlTastyMima
1 parent 8073f33 commit ef4e087

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

docs/customization.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Instead of using the super-plugins, for finer-grained control you can always add
2727

2828
- `tlVersionIntroduced` (setting): A map `scalaBinaryVersion -> version` e.g. `Map("2.13" -> "1.5.2", "3" -> "1.7.1")` used to indicate that a particular `crossScalaVersions` value was introduced in a given version (default: empty).
2929
- `tlMimaPreviousVersions` (setting): A set of previous versions to compare binary-compatibility against.
30-
- `tlTastyMima` (setting): Enable TASTy-MiMa (default: `false`).
3130

3231
### sbt-typelevel-sonatype
3332
`TypelevelSonatypePlugin`: Sets up publishing to Sonatype/Maven.

mima/src/main/scala/org/typelevel/sbt/TypelevelMimaPlugin.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ import sbttastymima.TastyMiMaPlugin
2525
import Keys._
2626
import MimaPlugin.autoImport._
2727
import TastyMiMaPlugin.autoImport._
28+
import TypelevelKernelPlugin.autoImport._
2829

2930
object TypelevelMimaPlugin extends AutoPlugin {
3031

31-
override def requires = MimaPlugin && TastyMiMaPlugin
32+
override def requires = TypelevelKernelPlugin && MimaPlugin && TastyMiMaPlugin
3233

3334
override def trigger = allRequirements
3435

@@ -38,7 +39,6 @@ object TypelevelMimaPlugin extends AutoPlugin {
3839
"A map scalaBinaryVersion -> version e.g. Map('2.13' -> '1.5.2', '3' -> '1.7.1') used to indicate that a particular crossScalaVersions value was introduced in a given version (default: empty).")
3940
lazy val tlMimaPreviousVersions = settingKey[Set[String]](
4041
"A set of previous versions to compare binary-compatibility against (default: auto-populated from git tags and the tlVersionIntroduced setting)")
41-
lazy val tlTastyMima = settingKey[Boolean]("Enable TASTy-MiMa (default: false)")
4242
}
4343

4444
import autoImport._
@@ -89,13 +89,12 @@ object TypelevelMimaPlugin extends AutoPlugin {
8989
else
9090
Set.empty
9191
},
92-
tlTastyMima := false,
9392
tastyMiMaReportIssues := {
94-
if (tlTastyMima.value && publishArtifact.value) tastyMiMaReportIssues.value
93+
if (tlIsScala3.value && publishArtifact.value) tastyMiMaReportIssues.value
9594
else ()
9695
},
9796
tastyMiMaPreviousArtifacts := {
98-
if (tlTastyMima.value && publishArtifact.value) {
97+
if (tlIsScala3.value && publishArtifact.value) {
9998
tlMimaPreviousVersions
10099
.value
101100
.flatMap(v => V(v))

0 commit comments

Comments
 (0)