Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ val sbtplugin = project.enablePlugins(SbtPlugin).dependsOn(core.jvm).settings(co
scriptedLaunchOpts += s"-Dplugin.version=${version.value}",
scriptedLaunchOpts += s"-Dsbt.boot.directory=${file(sys.props("user.home")) / ".sbt" / "boot"}",
MimaSettings.mimaSettings,
// remove once there is a previous `_sbt2_3` sbt plugin release
mimaFailOnNoPrevious := false,
mimaPreviousArtifacts := (if (scalaVersion.value.startsWith("3.8")) Set.empty else mimaPreviousArtifacts.value),
)

val testFunctional = taskKey[Unit]("Run the functional test")
Expand Down
9 changes: 4 additions & 5 deletions project/MimaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._

object MimaSettings {
// clear out mimaBinaryIssueFilters when changing this
val mimaPreviousVersion = "1.1.4"
val mimaPreviousVersion = "1.1.5"

val mimaSettings = Def.settings (
mimaPreviousArtifacts := Set(pluginProjectID.value.withRevision(mimaPreviousVersion)
Expand All @@ -24,10 +24,9 @@ object MimaSettings {
// * com.typesafe.tools.mima.core.ProblemFilters
// * com.typesafe.tools.mima.core.*Problem
// * com.typesafe.tools.mima.core.util.log.Logging
exclude[MissingClassProblem]("com.typesafe.tools.mima.plugin.MimaPlugin$EmptyMap"),
exclude[MissingClassProblem]("com.typesafe.tools.mima.plugin.MimaPlugin$EmptySet"),
exclude[MissingClassProblem]("com.typesafe.tools.mima.plugin.MimaPlugin$NoPreviousArtifacts$"),
exclude[MissingClassProblem]("com.typesafe.tools.mima.plugin.MimaPlugin$NoPreviousClassfiles$"),

// _3 artifact was built with 3.3, mima checking with 3.8 reports a generic signature change (scala3#24684)
ProblemFilters.exclude[IncompatibleSignatureProblem]("com.typesafe.tools.mima.core.TastyUnpickler#MethodSignature.copy$default$*"),
),
)
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ scalacOptions ++= Seq(
)

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.10")