From c4b90111aab6c7df74b032692a79a979ba488d49 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 5 Nov 2021 18:20:05 +0100 Subject: [PATCH] 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. --- project/Settings.scala | 16 +--------------- project/plugins.sbt | 2 -- scripts/ci.sh | 2 -- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index 8951651b9..0e6aef1bb 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -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") diff --git a/project/plugins.sbt b/project/plugins.sbt index 48a006172..272942f60 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/scripts/ci.sh b/scripts/ci.sh index 7de6a1ef3..123a51cf9 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -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"