From f5b1c59a6764d0fdbabb73beb1b83dbe335c2898 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 3 Feb 2020 17:53:41 +0100 Subject: [PATCH 1/3] Clean-up --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 29512d8d1..512e5d1cc 100644 --- a/build.sbt +++ b/build.sbt @@ -63,8 +63,7 @@ lazy val `lm-coursier-shaded` = project ), packageBin.in(Shading) := { val jar = packageBin.in(Shading).value - // ignoreFiles is there temporarily, until https://github.com/coursier/coursier/pull/1317 is merged - Check.onlyNamespace("lmcoursier", jar, ignoreFiles = Set("coursier.properties")) + Check.onlyNamespace("lmcoursier", jar) jar } ) From 2843e6b415ca5d45d201115b7f75621f9c02d41c Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 3 Feb 2020 17:58:18 +0100 Subject: [PATCH 2/3] Add missing explicitly shaded namespaces just in case These are automatically shaded fine with the latest sbt-shading. This just speeds things up (and is safer against possible regressions in sbt-shading). --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 512e5d1cc..3a753078c 100644 --- a/build.sbt +++ b/build.sbt @@ -52,7 +52,8 @@ lazy val `lm-coursier-shaded` = project "shapeless", "argonaut", "org.fusesource", - "org.jline" + "macrocompat", + "io.github.alexarchambault.windowsansi" ), libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion0 % "shaded", From 0caf7642600e1723e503f91c272b639dbb635cf0 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 3 Feb 2020 17:59:14 +0100 Subject: [PATCH 3/3] Switch to coursier 2.0.0-RC6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3a753078c..06d616539 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ inThisBuild(List( ) )) -val coursierVersion0 = "2.0.0-RC5-6" +val coursierVersion0 = "2.0.0-RC6" lazy val `lm-coursier` = project .in(file("modules/lm-coursier"))