From 5739ea7b603e3242c9b6f7bbbbeb50fb4a24b5aa Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 25 Apr 2019 16:55:31 +0200 Subject: [PATCH] Have sbt-lm-coursier rely on lm-coursier-shaded by default --- build.sbt | 16 +++++++++++++--- .../{shared-2 => sbt-coursier}/s3/build.sbt | 0 .../s3/project/build.properties | 0 .../s3/project/extra.sbt | 0 .../s3/project/plugins.sbt | 0 .../s3/project/project/plugins.sbt | 0 .../s3/src/main/scala/Foo.scala | 0 .../{shared-2 => sbt-coursier}/s3/test | 0 .../shared-2/update-sbt-classifiers/build.sbt | 18 ++++++++++++------ 9 files changed, 25 insertions(+), 9 deletions(-) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/project/build.properties (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/project/extra.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/project/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/src/main/scala/Foo.scala (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => sbt-coursier}/s3/test (100%) diff --git a/build.sbt b/build.sbt index 722cc1547..4ed64a8d7 100644 --- a/build.sbt +++ b/build.sbt @@ -64,10 +64,19 @@ lazy val `sbt-coursier-shared` = project testFrameworks += new TestFramework("utest.runner.Framework") ) +lazy val `sbt-coursier-shared-shaded` = project + .in(file("modules/sbt-coursier-shared/target/shaded-module")) + .dependsOn(`lm-coursier-shaded`) + .settings( + plugin, + generatePropertyFile, + unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`sbt-coursier-shared`).value + ) + lazy val `sbt-lm-coursier` = project .in(file("modules/sbt-lm-coursier")) .enablePlugins(ScriptedPlugin) - .dependsOn(`sbt-coursier-shared`) + .dependsOn(`sbt-coursier-shared-shaded`) .settings( plugin, sbtTestDirectory := sbtTestDirectory.in(`sbt-coursier`).value, @@ -76,8 +85,8 @@ lazy val `sbt-lm-coursier` = project // TODO Get those automatically // (but shouldn't scripted itself handle that…?) - publishLocal.in(`lm-coursier`).value - publishLocal.in(`sbt-coursier-shared`).value + publishLocal.in(`lm-coursier-shaded`).value + publishLocal.in(`sbt-coursier-shared-shaded`).value } ) @@ -145,6 +154,7 @@ lazy val `sbt-coursier-root` = project `lm-coursier-shaded`, `sbt-coursier`, `sbt-coursier-shared`, + `sbt-coursier-shared-shaded`, `sbt-lm-coursier`, `sbt-pgp-coursier`, `sbt-shading` diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/project/build.properties b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/build.properties similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/project/build.properties rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/build.properties diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/project/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/s3/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/s3/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/test diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt index 0c59d622c..2dac5446b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt @@ -32,13 +32,19 @@ updateSbtClassifiersCheck := { .toSeq .flatten - def ensureHasArtifact(org: String, name: String) = + def ensureHasArtifact(orgName: (String, String)*) = assert( - artifacts(org, name).exists(_._2.getName.endsWith("-sources.jar")), - s"$org:$name not found" + orgName.exists { + case (org, name) => + artifacts(org, name).exists(_._2.getName.endsWith("-sources.jar")) + }, + s"Any of $orgName not found" ) - ensureHasArtifact("org.scala-lang", "scala-library") - ensureHasArtifact("io.get-coursier", "coursier-core_" + scalaBinaryVersion.value) - ensureHasArtifact("io.get-coursier", "lm-coursier_" + scalaBinaryVersion.value) + ensureHasArtifact("org.scala-lang" -> "scala-library") + ensureHasArtifact("org.scala-lang.modules" -> s"scala-xml_${scalaBinaryVersion.value}") + ensureHasArtifact( + "io.get-coursier" -> s"lm-coursier_${scalaBinaryVersion.value}", + "io.get-coursier" -> s"lm-coursier-shaded_${scalaBinaryVersion.value}" + ) }