Revert "allow usage of scalafix-interfaces without scalafix-properties"

This reverts commit 677129f.

Author: bjaglin

build.sbt

@@ -380,15 +380,7 @@ lazy val integration = projectMatrix
           .collect { case p @ LocalProject(n) if n.startsWith("cli3") => p }
           .map(_ / publishLocalTransitive)): _*
       )
-      .value,
-    // Mimic sbt-scalafix usage of interfaces (without properties per default)
-    // to exercise dynamic loading of latest scalafix-properties artifact
-    Test / internalDependencyClasspath := {
-      val prev = (Test / internalDependencyClasspath).value
-      val propertiesClassDirectory =
-        (properties / Compile / classDirectory).value
-      prev.filter(_.data != propertiesClassDirectory)
-    }
+      .value
   )
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatform(CrossVersion.full, cliScalaVersions)

scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java

@@ -163,26 +163,11 @@ static Scalafix fetchAndClassloadInstance(String requestedScalaVersion, List<Rep
 
         Properties properties = new Properties();
         String propertiesPath = "scalafix-interfaces.properties";
+        InputStream stream = Scalafix.class.getClassLoader().getResourceAsStream(propertiesPath);
         try {
-            InputStream stream = Scalafix.class.getClassLoader().getResourceAsStream(propertiesPath);
             properties.load(stream);
-        } catch (Exception e) {
-            System.err.println(
-                "Failed to load '" + propertiesPath +  "' from local artifact, " +
-                "falling back to fetching the latest scalafix version...");
-
-            try {
-                List<URL> jars = ScalafixCoursier.latestScalafixPropertiesJars(repositories);
-                URLClassLoader classLoader =
-                    new URLClassLoader(jars.stream().toArray(URL[]::new), null);
-                
-                InputStream stream = classLoader.getResourceAsStream(propertiesPath);
-                properties.load(stream);
-            } catch (Exception ee) {
-                throw new ScalafixException(
-                    "Failed to load '" + propertiesPath + "' from local & remote artifacts",
-                    ee);
-            }
+        } catch (IOException | NullPointerException e) {
+            throw new ScalafixException("Failed to load '" + propertiesPath + "' to lookup versions", e);
         }
 
         String scalafixVersion = properties.getProperty("scalafixVersion");

scalafix-interfaces/src/main/java/scalafix/internal/interfaces/ScalafixCoursier.java

@@ -15,21 +15,6 @@
 
 public class ScalafixCoursier {
 
-    private static VersionListing versions(
-            List<Repository> repositories,
-            coursierapi.Module module
-    ) throws ScalafixException {
-        try {
-            return Versions.create()
-                    .withModule(module)
-                    .withRepositories(repositories.stream().toArray(Repository[]::new))
-                    .versions()
-                    .getMergedListings();
-        } catch (CoursierError e) {
-            throw new ScalafixException("Failed to list versions for " + module + " from " + repositories, e);
-        }
-    }
-
     private static FetchResult fetch(
             List<Repository> repositories,
             List<Dependency> dependencies,
@@ -59,22 +44,6 @@ private static List<URL> toURLs(FetchResult result) throws ScalafixException {
         return urls;
     }
 
-    public static List<URL> latestScalafixPropertiesJars(
-            List<Repository> repositories
-    ) throws ScalafixException {
-        Module module = Module.of("ch.epfl.scala", "scalafix-properties");
-        String version = versions(repositories, module)
-                .getAvailable()
-                .stream()
-                // Ignore RC & SNAPSHOT versions
-                .filter(v -> !v.contains("-"))
-                .reduce((older, newer) -> newer)
-                .orElseThrow(() -> new ScalafixException("Could not find any stable version for " + module)); 
-
-        Dependency scalafixProperties = Dependency.of(module, version);
-        return toURLs(fetch(repositories, Collections.singletonList(scalafixProperties), ResolutionParams.create()));
-    }
-
     public static List<URL> scalafixCliJars(
             List<Repository> repositories,
             String scalafixVersion,