Merge pull request #1596 from bjaglin/move-pprint

pprint is only required on -cli for 0.9.x compat
scalacenter · Apr 12, 2022 · 71e6ca2 · 71e6ca2
2 parents c5633c6 + 404d805
commit 71e6ca2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/build.sbt b/build.sbt
@@ -69,16 +69,9 @@ lazy val core = projectMatrix
       googleDiff,
       collectionCompat
     ),
-    libraryDependencies ++= {
-      if (isScala211.value) Seq(metaconfigFor211)
-      else
-        Seq(
-          metaconfig,
-          // metaconfig 0.10.0 shaded pprint but rules built with an old
-          // scalafix-core must have the original package in the classpath to link
-          // https://github.com/scalameta/metaconfig/pull/154/files#r794005161
-          pprint % Runtime
-        )
+    libraryDependencies += {
+      if (isScala211.value) metaconfigFor211
+      else metaconfig
     }
   )
   .defaultAxes(VirtualAxis.jvm)
@@ -128,6 +121,16 @@ lazy val cli = projectMatrix
       jgit,
       commonText
     ),
+    libraryDependencies ++= {
+      if (isScala211.value) Seq()
+      else
+        Seq(
+          // metaconfig 0.10.0 shaded pprint but rules built with an old
+          // scalafix-core must have the original package in the classpath to link
+          // https://github.com/scalameta/metaconfig/pull/154/files#r794005161
+          pprint % Runtime
+        )
+    },
     publishLocalTransitive := Def.taskDyn {
       val ref = thisProjectRef.value
       publishLocal.all(ScopeFilter(inDependencies(ref)))

diff --git a/scalafix-interfaces/src/main/java/scalafix/internal/interfaces/ScalafixCoursier.java b/scalafix-interfaces/src/main/java/scalafix/internal/interfaces/ScalafixCoursier.java
@@ -49,23 +49,10 @@ public static List<URL> scalafixCliJars(
             String scalafixVersion,
             String scalaVersion
     ) throws ScalafixException {
-        List<Dependency> dependencies = new ArrayList<Dependency>();
-        dependencies.add(
-            Dependency.parse(
-                "ch.epfl.scala:::scalafix-cli:" + scalafixVersion,
-                ScalaVersion.of(scalaVersion)
-            ).withConfiguration("runtime")
-        );
-        // Coursier does not seem to fetch runtime dependencies transitively, despite what Maven dictates
-        // https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#dependency-scope
-        // so to be able to retrieve the runtime dependencies of scalafix-core, we need an explicit reference
-        dependencies.add(
-            Dependency.parse(
-                "ch.epfl.scala::scalafix-core:" + scalafixVersion,
-                ScalaVersion.of(scalaVersion)
-            ).withConfiguration("runtime")
-        );
-        return toURLs(fetch(repositories, dependencies, ResolutionParams.create()));
+        Dependency scalafixCli = Dependency
+				.parse("ch.epfl.scala:::scalafix-cli:" + scalafixVersion, ScalaVersion.of(scalaVersion))
+				.withConfiguration("runtime");
+        return toURLs(fetch(repositories, Collections.singletonList(scalafixCli), ResolutionParams.create()));
     }
 
     public static FetchResult toolClasspath(