Skip to content

Commit 99d1023

Browse files
Use just sbt-mima for compatibility checks
1 parent 2b55092 commit 99d1023

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
jvm: 8
2323
apps: sbt-launcher
24-
- run: sbt ++$SCALA_VERSION test evictionCheck compatibilityCheck
24+
- run: sbt ++$SCALA_VERSION test mimaReportBinaryIssues
2525
env:
2626
SCALA_VERSION: ${{ matrix.SCALA_VERSION }}
2727

build.sbt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ inThisBuild(List(
2121
)
2222
))
2323

24+
val previousVersions = Set.empty[String]
25+
lazy val mimaSettings = Def.settings(
26+
mimaPreviousArtifacts := previousVersions.map(organization.value %% moduleName.value % _)
27+
)
2428

2529
lazy val core = crossProject(JVMPlatform, JSPlatform)
2630
.jsConfigure(_.disablePlugins(MimaPlugin))
@@ -30,9 +34,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
3034
libraryDependencies += Deps.dataClass % Provided
3135
)
3236
.jvmSettings(
33-
compatibilitySettings,
34-
mimaPreviousArtifacts := mimaPreviousArtifacts.value
35-
.filter(!_.revision.startsWith("0.7."))
37+
mimaSettings
3638
)
3739

3840
lazy val coreJvm = core.jvm
@@ -42,7 +44,7 @@ lazy val `joda-time` = project
4244
.dependsOn(coreJvm)
4345
.settings(
4446
shared,
45-
compatibilitySettings,
47+
mimaSettings,
4648
plotlyPrefix,
4749
libraryDependencies += Deps.jodaTime
4850
)
@@ -56,7 +58,7 @@ lazy val render = crossProject(JVMPlatform, JSPlatform)
5658
plotlyPrefix
5759
)
5860
.jvmSettings(
59-
compatibilitySettings,
61+
mimaSettings,
6062
mimaCurrentClassfiles := shadedPackageBin.value,
6163
Mima.renderFilters,
6264
shadedModules += Deps.argonautShapeless.value.module,
@@ -170,8 +172,7 @@ lazy val demo = project
170172
.commonJSName("PrismScala")
171173
.dependsOn("prism-java.js")
172174
),
173-
generateCustomSources,
174-
evictionRules += "org.scala-js" % "scalajs-dom_*" % "semver"
175+
generateCustomSources
175176
)
176177

177178
lazy val tests = project
@@ -192,7 +193,7 @@ lazy val almond = project
192193
.dependsOn(coreJvm, renderJvm)
193194
.settings(
194195
shared,
195-
compatibilitySettings,
196+
mimaSettings,
196197
plotlyPrefix,
197198
libraryDependencies += Deps.almondScalaApi % "provided"
198199
)

project/Settings.scala

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import com.jsuereth.sbtpgp._
33
import sbt._
44
import sbt.Keys._
5-
import sbtevictionrules.EvictionRulesPlugin.autoImport._
65

76
object Settings {
87

@@ -111,17 +110,7 @@ object Settings {
111110
scalacOptions ++= {
112111
if (isAtLeastScala213.value) Seq("-Ymacro-annotations")
113112
else Nil
114-
},
115-
evictionRules += "org.scala-js" %% "scalajs-library" % "semver"
116-
)
117-
118-
lazy val compatibilitySettings = Def.settings(
119-
sbtcompatibility.SbtCompatibilityPlugin.autoImport.compatibilityIgnored ++= Seq(
120-
// former dependency of core, now marked as "provided"
121-
"io.github.alexarchambault" %% "data-class",
122-
// transitive dependency of data-class
123-
"org.scala-lang" % "scala-reflect"
124-
)
113+
}
125114
)
126115

127116
lazy val plotlyPrefix = {

project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
2-
addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8")
3-
addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-eviction-rules" % "0.2.0")
42
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.1")
53
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
64
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

0 commit comments

Comments
 (0)