Revert upgrading sbt plugins to workaround scala/scala3#22890 - was leading to multiple more new issues

Author: WojciechMazur

coordinator/configs/projects-config.conf

@@ -306,16 +306,6 @@ danslapman_morphling{
   projects.exclude = [morphling-circe] // Needs update due to source compatible change
 }
 dapperware_dappermongo.tests = compile-only // test containers
-davenverse_epimetheus-community	{
-  source-patches = [{
-    path = "build.sbt"
-    pattern      = """ThisBuild / mergifyStewardConfig ~= {
-  _.map(_.copy(mergeMinors = true, author = "davenverse-steward[bot]"))
-}
-"""
-    replace-with = ""
-  }]
-}
 davenverse_fuuid {
   sbt.commands = [
     // Disable intergration tests using test containers
@@ -392,17 +382,7 @@ durban_choam{
     pattern      = "MapHelper.ttrie[Int, String](h)"
     replace-with = "MapHelper.ttrie[Int, String](using h)"   
   }]
-}
-dwolla_fs2-aws {
-  source-patches = [{
-    path = "build.sbt"
-    pattern      = """ThisBuild / mergifyStewardConfig ~= { _.map(_.copy(
-  author = "dwolla-oss-scala-steward[bot]",
-  mergeMinors = true,
-))}"""
-    replace-with = ""   
-  }]
-}	 
+} 
 earogov_ordset{
   source-patches = [{ 
     path = "build.sc"
@@ -1551,15 +1531,6 @@ typelevel_laika {
     }
   ]
 }
-typelevel_log4cats-natchez{
-  source-patches = [{
-    path = "build.sbt"
-    pattern      = """ThisBuild / mergifyStewardConfig ~= {
-  _.map(_.copy(mergeMinors = true, author = "typelevel-steward[bot]", action = MergifyAction.Merge(method = Option("squash"))))
-}"""
-    replace-with = ""
-  }] 
-}
 typelevel_otel4s.tests = compile-only
 typelevel_otel4s-experimental.source-patches = [
   {

coordinator/src/main/scala/ProjectConfigDiscovery.scala

@@ -282,9 +282,6 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredC
           case _ => None
         }
     }
-    object AddSbtPluginRef:
-      def unapply(v: String): Option[AddSbtPlugin] = AddSbtPlugin.unapply(v)
-
 
     commonBuildFiles(projectDir).flatMap { file =>
       def patch(pattern: String, replacement: String) = SourcePatch(
@@ -298,59 +295,10 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredC
 
         case line @ s"ThisBuild${_}/${_}tlFatalWarnings${_}:=${_}true" =>
           patch(pattern = line, replacement = "")
-            
-        // See https://github.com/scala/scala3/issues/22890
-        // All of the patches below should eventually be removed once the original issue is fixed
-        case line @ AddSbtPluginRef(
-              defn @ AddSbtPlugin("org.typelevel", s"sbt-typelevel${_}", version)
-            ) if SemVersion.unapply(version).forall(_ < SemVersion.unsafe("0.7.7")) =>
-          patch(line, defn.copy(version = "0.7.7").show)
-
-        // Conflicts with org.typelevel:sbt-typelevel-settings
-        case line @ AddSbtPluginRef(
-          defn @ AddSbtPlugin("com.armanbilge", "sbt-scala-native-config-brew-github-actions", version)
-        ) if SemVersion.unapply(version).forall(_ < SemVersion.unsafe("0.3.0")) =>
-          patch(line, defn.copy(version = "0.3.0").show)
-        // Same eviction problems
-        case line @ AddSbtPluginRef(
-          defn @ AddSbtPlugin("org.scalablytyped.converter", "sbt-converter", version)
-        ) if SemVersion.unapply(version).forall(_ < SemVersion.unsafe("1.0.0-beta44")) =>
-          patch(line, defn.copy(version = "1.0.0-beta44").show)
-        
-        // Same issue as with sbt-typelevel-settings
-         case line @ AddSbtPluginRef(
-              defn @ AddSbtPlugin("io.circe", "sbt-circe-org", version)
-            ) if SemVersion.unapply(version).forall(_ < SemVersion.unsafe("0.4.0")) =>
-            patch(line, defn.copy(version = "0.4.0").show)
-        
-        case line @ AddSbtPluginRef(
-              defn @ AddSbtPlugin("edu.gemini", "sbt-lucuma-lib", version)
-            ) if SemVersion.unapply(version).forall(_ < SemVersion.unsafe("0.12.0")) =>
-            patch(line, defn.copy(version = "0.12.0").show)
-            
-        case s"${_}libraryDependencies :=${rhs}" 
-        if !rhs.contains("libraryDependencies.value") =>  
-          patch(
-            pattern = "libraryDependencies :=", 
-            replacement = """libraryDependencies := Seq("org.scala-lang" % "scala3-library_3" % "<SCALA_VERSION>") ++ """
-          )
       }.distinct
     }
   end discoverSourcePatches
 
-  case class AddSbtPlugin(org: String, name: String, version: String) {
-    def show = s"""addSbtPlugin("$org" % "$name" % "$version")"""
-  }
-  object AddSbtPlugin {
-    def unapply(v: String): Option[AddSbtPlugin] = v.trim() match {
-      case s"""addSbtPlugin("$org"${_}%${_}"$name"${_}%${_}"$version")""" =>
-        Some(AddSbtPlugin(org, name, version))
-      case s"""addSbtPlugin("$org"${_}%${_}"$name"${_}%${_} $version)""" =>
-        Some(AddSbtPlugin(org, name, version))
-      case _ => None
-    }
-  }
-
   private def tryReadLines(file: os.Path): Seq[String] = {
     try os.read.lines(file).toSeq
     catch {