Merge pull request #358 from alexarchambault/coursier-nightly

Update coursier to 2.1.0-M1

build.sbt

@@ -15,7 +15,7 @@ inThisBuild(List(
   )
 ))
 
-val coursierVersion0 = "2.0.16"
+val coursierVersion0 = "2.1.0-M1"
 val lmVersion = "1.3.4"
 val lm2_13Version = "1.5.0-M3"
 
@@ -54,6 +54,15 @@ lazy val `lm-coursier-shaded` = project
     unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value,
     shadedModules += "io.get-coursier" %% "coursier",
     validNamespaces += "lmcoursier",
+    validEntries ++= Set(
+      // FIXME Ideally, we should just strip those from the resulting JAR…
+      "README", // from google-collections via plexus-archiver (see below)
+      // from plexus-util via plexus-archiver (see below)
+      "licenses/extreme.indiana.edu.license.TXT",
+      "licenses/javolution.license.TXT",
+      "licenses/thoughtworks.TXT",
+      "licenses/"
+    ),
     shadingRules ++= {
       val toShade = Seq(
         "coursier",
@@ -62,7 +71,15 @@ lazy val `lm-coursier-shaded` = project
         "org.fusesource",
         "macrocompat",
         "io.github.alexarchambault.windowsansi",
-        "concurrentrefhashmap"
+        "concurrentrefhashmap",
+        // pulled by the plexus-archiver stuff that coursier-cache
+        // depends on for now… can hopefully be removed in the future
+        "com.google.common",
+        "org.apache.commons",
+        "org.apache.xbean",
+        "org.codehaus",
+        "org.iq80",
+        "org.tukaani"
       )
       for (ns <- toShade)
         yield ShadingRule.moveUnder(ns, "lmcoursier.internal.shaded")

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")

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")
 

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"