From e45876361c19a8080408eb0671b00229faf47eff Mon Sep 17 00:00:00 2001
From: Brice Jaglin <bjaglin@gmail.com>
Date: Tue, 24 Dec 2024 00:29:41 +0100
Subject: [PATCH] fail hard on EOL Scala 3 minor

---
 build.sbt                                     |  1 -
 project/Dependencies.scala                    |  1 -
 project/ScalafixBuild.scala                   |  2 -
 .../internal/interfaces/ScalafixImpl.scala    |  4 +-
 .../java/scalafix/interfaces/Scalafix.java    | 18 ++++----
 .../tests/interfaces/ScalafixSuite.scala      | 42 +++++++------------
 .../tests/cli/InterfacesPropertiesSuite.scala |  1 -
 7 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/build.sbt b/build.sbt
index de361cf9d..28c40ab4d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,7 +33,6 @@ lazy val interfaces = project
       props.put("scala212", scala212)
       props.put("scala213", scala213)
       props.put("scala33", scala33)
-      props.put("scala35", scala35)
       props.put("scala36", scala36)
       props.put("scala3LTS", scala3LTS)
       props.put("scala3Next", scala3Next)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 506f69b29..2f99ffb9d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -8,7 +8,6 @@ object Dependencies {
   val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
   val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.15")
   val scala33 = "3.3.4"
-  val scala35 = "3.5.2"
   val scala36 = "3.6.2"
   val scala3LTS = scala33
   val scala3Next = sys.props.getOrElse("scala3.nightly", scala36)
diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
index a060b55df..f5c03cc0b 100644
--- a/project/ScalafixBuild.scala
+++ b/project/ScalafixBuild.scala
@@ -37,7 +37,6 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
       scala212,
       scala213,
       scala33,
-      scala35,
       scala36,
       scala3Next
     ).distinct
@@ -146,7 +145,6 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
         "scala212" -> scala212,
         "scala213" -> scala213,
         "scala33" -> scala33,
-        "scala35" -> scala35,
         "scala36" -> scala36,
         "scala3LTS" -> scala3LTS,
         "scala3Next" -> scala3Next,
diff --git a/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixImpl.scala b/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixImpl.scala
index 2b922d4d5..b87b86f09 100644
--- a/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixImpl.scala
+++ b/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixImpl.scala
@@ -37,7 +37,9 @@ final class ScalafixImpl extends Scalafix {
   override def scala33(): String =
     Versions.scala33
   override def scala35(): String =
-    Versions.scala35
+    throw new java.lang.UnsupportedOperationException(
+      "Scala 3.5 is no longer supported; the final version supporting it is Scalafix 0.13.x"
+    )
   override def scala36(): String =
     Versions.scala36
   override def scala3LTS(): String =
diff --git a/scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java b/scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java
index a731a5d4c..2ca5d3e0b 100644
--- a/scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java
+++ b/scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java
@@ -75,9 +75,7 @@ public interface Scalafix {
      */
     String scala33();
 
-    /**
-     * The Scala 3.5 version in {@link #supportedScalaVersions()}
-     */
+    @Deprecated
     String scala35();
 
     /**
@@ -146,16 +144,16 @@ static Scalafix fetchAndClassloadInstance(String requestedScalaVersion, List<Rep
         } else if (requestedScalaMajorMinorOrMajorVersion.equals("2.13") ||
             requestedScalaMajorMinorOrMajorVersion.equals("2")) {
             scalaVersionKey = "scala213";
-        } else if (requestedScalaMajorMinorOrMajorVersion.equals("3.0") ||
-            requestedScalaMajorMinorOrMajorVersion.equals("3.1") ||
-            requestedScalaMajorMinorOrMajorVersion.equals("3.2") ||
-            requestedScalaMajorMinorOrMajorVersion.equals("3.3")) {
+        } else if (requestedScalaMajorMinorOrMajorVersion.equals("3.3")) {
             scalaVersionKey = "scala33";
-        } else if (requestedScalaMajorMinorOrMajorVersion.equals("3.5")) {
-            scalaVersionKey = "scala35";
         } else if (requestedScalaMajorMinorOrMajorVersion.equals("3.6")) {
             scalaVersionKey = "scala36";
-        } else if (requestedScalaMajorMinorOrMajorVersion.startsWith("3")) {
+        } else if (!requestedScalaMajorMinorOrMajorVersion.equals("3.0") &&
+            !requestedScalaMajorMinorOrMajorVersion.equals("3.1") &&
+            !requestedScalaMajorMinorOrMajorVersion.equals("3.2") &&
+            !requestedScalaMajorMinorOrMajorVersion.equals("3.4") &&
+            !requestedScalaMajorMinorOrMajorVersion.equals("3.5") &&
+            requestedScalaMajorMinorOrMajorVersion.startsWith("3")) {
             scalaVersionKey = "scala3Next";
         } else {
             throw new IllegalArgumentException("Unsupported scala version " + requestedScalaVersion);
diff --git a/scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala b/scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala
index b20f0477c..53b7fbcf9 100644
--- a/scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala
+++ b/scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala
@@ -44,7 +44,6 @@ class ScalafixSuite extends AnyFunSuite {
     assert(api.scala212() == Versions.scala212)
     assert(api.scala213() == Versions.scala213)
     assert(api.scala33() == Versions.scala33)
-    assert(api.scala35() == Versions.scala35)
     assert(api.scala36() == Versions.scala36)
     assert(api.scala3LTS() == Versions.scala3LTS)
     assert(api.scala3Next() == Versions.scala3Next)
@@ -57,15 +56,24 @@ class ScalafixSuite extends AnyFunSuite {
     assert(help.contains("Usage: scalafix"))
   }
 
-  test("fail to classload Scala 2.11 with full version") {
+  test("fail to classload EOL versions") {
     assertThrows[IllegalArgumentException](
-      Scalafix.fetchAndClassloadInstance("2.11.0", repositories)
+      Scalafix.fetchAndClassloadInstance("2.11", repositories)
     )
-  }
-
-  test("fail to classload Scala 2.11 with minor version") {
     assertThrows[IllegalArgumentException](
-      Scalafix.fetchAndClassloadInstance("2.11", repositories)
+      Scalafix.fetchAndClassloadInstance("3.0", repositories)
+    )
+    assertThrows[IllegalArgumentException](
+      Scalafix.fetchAndClassloadInstance("3.1", repositories)
+    )
+    assertThrows[IllegalArgumentException](
+      Scalafix.fetchAndClassloadInstance("3.2", repositories)
+    )
+    assertThrows[IllegalArgumentException](
+      Scalafix.fetchAndClassloadInstance("3.4", repositories)
+    )
+    assertThrows[IllegalArgumentException](
+      Scalafix.fetchAndClassloadInstance("3.5", repositories)
     )
   }
 
@@ -96,16 +104,6 @@ class ScalafixSuite extends AnyFunSuite {
     assert(scalafixAPI.scalaVersion() == Versions.scala213)
   }
 
-  test("classload Scala 3 LTS with full pre-LTS version") {
-    val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.0.0", repositories)
-    assert(scalafixAPI.scalaVersion() == Versions.scala3LTS)
-  }
-
-  test("classload Scala 3 LTS with major.minor pre-LTS version") {
-    val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.2", repositories)
-    assert(scalafixAPI.scalaVersion() == Versions.scala3LTS)
-  }
-
   test("classload Scala 3 LTS with full LTS version") {
     val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.3.4", repositories)
     assert(scalafixAPI.scalaVersion() == Versions.scala3LTS)
@@ -116,16 +114,6 @@ class ScalafixSuite extends AnyFunSuite {
     assert(scalafixAPI.scalaVersion() == Versions.scala3LTS)
   }
 
-  test("classload Scala 3.5 with full version") {
-    val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.5.2", repositories)
-    assert(scalafixAPI.scalaVersion() == Versions.scala35)
-  }
-
-  test("classload Scala 3.5 with major.minor version") {
-    val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.5", repositories)
-    assert(scalafixAPI.scalaVersion() == Versions.scala35)
-  }
-
   test("classload Scala 3 Next with full version") {
     val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.6.2", repositories)
     assert(scalafixAPI.scalaVersion() == Versions.scala3Next)
diff --git a/scalafix-tests/unit/src/test/scala/scalafix/tests/cli/InterfacesPropertiesSuite.scala b/scalafix-tests/unit/src/test/scala/scalafix/tests/cli/InterfacesPropertiesSuite.scala
index 80b83aa4d..7a9147519 100644
--- a/scalafix-tests/unit/src/test/scala/scalafix/tests/cli/InterfacesPropertiesSuite.scala
+++ b/scalafix-tests/unit/src/test/scala/scalafix/tests/cli/InterfacesPropertiesSuite.scala
@@ -26,7 +26,6 @@ class InterfacesPropertiesSuite extends AnyFunSuite with BeforeAndAfterAll {
   check("scala212", Versions.scala212)
   check("scala213", Versions.scala213)
   check("scala33", Versions.scala33)
-  check("scala35", Versions.scala35)
   check("scala36", Versions.scala36)
   check("scala3LTS", Versions.scala3LTS)
   check("scala3Next", Versions.scala3Next)