From 78e61fec0f66f11ea9b07ead432a2580c2000fa4 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 16 Jun 2020 14:16:10 +0200 Subject: [PATCH] Update sbt-compatibility to 0.0.8 (#252) --- project/Settings.scala | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index da03a2dcf..ed5096284 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -38,17 +38,12 @@ object Settings { if (isAtLeastScala213.value) Seq("-Ymacro-annotations") else Nil }, - compatibilityReconciliations ++= Seq( + compatibilityRules ++= 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", + "com.typesafe" %% "ssl-config-core" % "semver", + "net.java.dev.jna" % "jna*" % "always" ), compatibilityIgnored += "com.swoval" % "apple-file-events", evictionRules ++= Seq(