Skip to content

Commit

Permalink
Merge pull request #9926 from marcospereira/build/2.8.x/simplify-mima…
Browse files Browse the repository at this point in the history
…-configuration

[2.8.x]: Simplify mima configuration
  • Loading branch information
mergify[bot] committed Dec 19, 2019
2 parents 5ec9d19 + 24d8db4 commit c9dd132
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
2 changes: 0 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,11 @@ lazy val PlayAkkaHttp2SupportProject =

lazy val PlayClusterSharding = PlayCrossBuiltProject("Play-Cluster-Sharding", "cluster/play-cluster-sharding")
.settings(libraryDependencies ++= clusterDependencies)
.settings(mimaPreviousArtifacts := Set.empty)
.dependsOn(PlayProject)

lazy val PlayJavaClusterSharding =
PlayCrossBuiltProject("Play-Java-Cluster-Sharding", "cluster/play-java-cluster-sharding")
.settings(libraryDependencies ++= clusterDependencies)
.settings(mimaPreviousArtifacts := Set.empty)
.dependsOn(PlayProject)

lazy val PlayJdbcApiProject = PlayCrossBuiltProject("Play-JDBC-Api", "persistence/play-jdbc-api")
Expand Down
21 changes: 7 additions & 14 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ object BuildSettings {

private val VersionPattern = """^(\d+).(\d+).(\d+)(-.*)?""".r

def mimaPreviousVersions(version: String): Set[String] = Set("2.8.0")

def evictionSettings: Seq[Setting[_]] = Seq(
// This avoids a lot of dependency resolution warnings to be showed.
evictionWarningOptions in update := EvictionWarningOptions.default
Expand Down Expand Up @@ -190,24 +188,19 @@ object BuildSettings {
}
)

// Versions of previous minor releases being checked for binary compatibility
val mimaPreviousVersion: Option[String] = Some("2.8.0")

/**
* These settings are used by all projects that are part of the runtime, as opposed to the development mode of Play.
*/
def playRuntimeSettings: Seq[Setting[_]] = Def.settings(
playCommonSettings,
mimaDefaultSettings,
mimaPreviousArtifacts := {
// Binary compatibility is tested against these versions
val previousVersions = mimaPreviousVersions(version.value)
val cross = if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled
previousVersions.map(v => (organization.value %% moduleName.value % v).cross(cross))
},
mimaPreviousArtifacts := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v >= 13 => Set.empty // No release of Play 2.7 using Scala 2.13, yet
case _ => mimaPreviousArtifacts.value
}
},
mimaPreviousArtifacts := mimaPreviousVersion.map { version =>
val cross = if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled
(organization.value %% moduleName.value % version).cross(cross)
}.toSet,
mimaBinaryIssueFilters ++= Seq(
// Add mima filters here
),
Expand Down

0 comments on commit c9dd132

Please sign in to comment.