From e6be0cb7fb5689a0665757c96312f7d57ef1fa3f Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 9 Jun 2020 14:18:32 +0200 Subject: [PATCH] Add sbt-compatibility --- project/Settings.scala | 16 +++++++++++++++- project/plugins.sbt | 1 + scripts/travis.sh | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index 3b4e1ee1c..97c8d5275 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -4,6 +4,7 @@ import java.util.Locale import sbt._ import sbt.Keys._ import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts} +import sbtcompatibility.SbtCompatibilityPlugin.autoImport._ import com.jsuereth.sbtpgp._ @@ -35,7 +36,20 @@ object Settings { scalacOptions ++= { if (isAtLeastScala213.value) Seq("-Ymacro-annotations") else Nil - } + }, + compatibilityReconciliations ++= Seq( + "com.eed3si9n" %% "gigahorse-*" % "semver", + "org.scala-lang.modules" % "*" % "semver", + "org.scala-sbt" % "*" % "semver", + // FIXME sbt-compatibility should default to semver for java libs, pvp for scala ones, like evicted + "com.lmax" % "disruptor" % "semver", + "com.squareup.*" % "*" % "semver", + "com.swoval" % "apple-file-events" % "semver", + "com.typesafe" % "*" % "semver", + "net.java.dev.jna" % "jna*" % "always", + "org.apache.logging.log4j" % "log4j-*" % "semver", + ), + compatibilityIgnored += "com.swoval" % "apple-file-events" ) ++ { val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT) if (prop == "0" || prop == "false") diff --git a/project/plugins.sbt b/project/plugins.sbt index 37757aa67..5d5780214 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,5 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") +addSbtPlugin(("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.7").exclude("com.typesafe", "sbt-mima-plugin")) addSbtPlugin("com.github.alexarchambault.tmp" % "sbt-mima-plugin" % "0.7.1-SNAPSHOT") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0") diff --git a/scripts/travis.sh b/scripts/travis.sh index 6a8c67c3c..d17695225 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -25,7 +25,7 @@ runLmCoursierTests() { # publishing locally to ensure shading runs fine ./metadata/scripts/with-test-repo.sh ./sbt \ ++$TRAVIS_SCALA_VERSION! \ - mimaReportBinaryIssues \ + compatibilityCheck \ lm-coursier-shaded/publishLocal \ lm-coursier/test \ "sbt-lm-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA"