luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sbt-compatibility

This commit is contained in:
Alexandre Archambault 2020-06-09 14:18:32 +02:00
parent f29a170b9c
commit e6be0cb7fb
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
project/Settings.scala
View File

@ -4,6 +4,7 @@ import java.util.Locale
import sbt._ import sbt._
import sbt.Keys._ import sbt.Keys._
import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts} import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts}
import sbtcompatibility.SbtCompatibilityPlugin.autoImport._
import com.jsuereth.sbtpgp._ import com.jsuereth.sbtpgp._
@ -35,7 +36,20 @@ object Settings {
scalacOptions ++= { scalacOptions ++= {
if (isAtLeastScala213.value) Seq("-Ymacro-annotations") if (isAtLeastScala213.value) Seq("-Ymacro-annotations")
else Nil 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) val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT)
if (prop == "0" || prop == "false") if (prop == "0" || prop == "false")

1
project/plugins.sbt
View File

@ -1,4 +1,5 @@
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") 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("com.github.alexarchambault.tmp" % "sbt-mima-plugin" % "0.7.1-SNAPSHOT")
addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0")

2
scripts/travis.sh
View File

@ -25,7 +25,7 @@ runLmCoursierTests() {
# publishing locally to ensure shading runs fine # publishing locally to ensure shading runs fine
./metadata/scripts/with-test-repo.sh ./sbt \ ./metadata/scripts/with-test-repo.sh ./sbt \
++$TRAVIS_SCALA_VERSION! \ ++$TRAVIS_SCALA_VERSION! \
mimaReportBinaryIssues \ compatibilityCheck \
lm-coursier-shaded/publishLocal \ lm-coursier-shaded/publishLocal \
lm-coursier/test \ lm-coursier/test \
"sbt-lm-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA" "sbt-lm-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA"