Remove sbt-eviction-rules / sbt-version-policy for now

Running into weird issues with scala-xml 1/2, and the latest
sbt-version-policy needs a more recent sbt than the one we're on.
This commit is contained in:
Alexandre Archambault 2021-11-05 18:20:05 +01:00
parent fdb606c009
commit c4b90111aa
3 changed files with 1 additions and 19 deletions

View File

@ -4,8 +4,6 @@ import java.util.Locale
import sbt._
import sbt.Keys._
import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts}
import sbtcompatibility.SbtCompatibilityPlugin.autoImport._
import sbtevictionrules.EvictionRulesPlugin.autoImport._
import com.jsuereth.sbtpgp._
@ -38,19 +36,7 @@ object Settings {
scalacOptions ++= {
if (isAtLeastScala213.value) Seq("-Ymacro-annotations")
else Nil
},
compatibilityRules ++= Seq(
"com.eed3si9n" %% "gigahorse-*" % "semver",
"org.scala-lang.modules" % "*" % "semver",
"org.scala-sbt" % "*" % "semver",
"com.typesafe" %% "ssl-config-core" % "semver",
"net.java.dev.jna" % "jna*" % "always"
),
compatibilityIgnored += "com.swoval" % "apple-file-events",
evictionRules ++= Seq(
"com.eed3si9n" %% "gigahorse-*" % "semver",
"org.scala-lang.modules" %% "*" % "semver"
)
}
) ++ {
val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT)
if (prop == "0" || prop == "false")

View File

@ -1,6 +1,4 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8")
addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-eviction-rules" % "0.2.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.1")

View File

@ -24,8 +24,6 @@ runLmCoursierTests() {
# publishing locally to ensure shading runs fine
./metadata/scripts/with-test-repo.sh $SBT \
evictionCheck \
compatibilityCheck \
+lm-coursier-shaded/publishLocal \
+lm-coursier/test \
"sbt-lm-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA"