Merge pull request #182 from guardrail-dev/bumping

Bumping guardrail modules
guardrail-dev · Jul 2, 2022 · 8e6bad7 · 8e6bad7
2 parents 5af0940 + c36673b
commit 8e6bad7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/modules/core/build.sbt b/modules/core/build.sbt
@@ -8,17 +8,17 @@ addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")
 
 // Dependencies
 libraryDependencies ++= Seq(
-  "dev.guardrail" %% "guardrail-core" % "0.73.2",
-  "dev.guardrail" %% "guardrail-java-support" % "0.71.1",
-  "dev.guardrail" %% "guardrail-scala-support" % "0.72.1",
+  "dev.guardrail" %% "guardrail-core" % "0.74.0",
+  "dev.guardrail" %% "guardrail-java-support" % "0.72.0",
+  "dev.guardrail" %% "guardrail-scala-support" % "0.74.0",
 
   // Pending removal, before we hit 1.0.0, as per https://github.com/guardrail-dev/guardrail/issues/1195
-  "dev.guardrail" %% "guardrail-java-async-http" % "0.70.1",
-  "dev.guardrail" %% "guardrail-java-dropwizard" % "0.70.1",
-  "dev.guardrail" %% "guardrail-java-spring-mvc" % "0.70.1",
-  "dev.guardrail" %% "guardrail-scala-akka-http" % "0.72.1",
-  "dev.guardrail" %% "guardrail-scala-dropwizard" % "0.70.1",
-  "dev.guardrail" %% "guardrail-scala-http4s" % "0.72.2"
+  "dev.guardrail" %% "guardrail-java-async-http" % "0.71.0",
+  "dev.guardrail" %% "guardrail-java-dropwizard" % "0.71.0",
+  "dev.guardrail" %% "guardrail-java-spring-mvc" % "0.71.0",
+  "dev.guardrail" %% "guardrail-scala-akka-http" % "0.74.0",
+  "dev.guardrail" %% "guardrail-scala-dropwizard" % "0.71.0",
+  "dev.guardrail" %% "guardrail-scala-http4s" % "0.74.0"
 )
 
 buildInfoKeys := Seq[BuildInfoKey](organization, version)

diff --git a/modules/core/src/main/scala/Tasks.scala b/modules/core/src/main/scala/Tasks.scala
@@ -70,8 +70,17 @@ object Tasks {
           case ModuleConflict(section) =>
             println(s"${AnsiColor.RED}Error: Too many modules specified for ${section}${AnsiColor.RESET}")
             throw new CodegenFailedException()
-          case UnconsumedModules(modules) =>
-            println(s"${AnsiColor.RED}Error: Unconsumed modules: ${modules.mkString(", ")}${AnsiColor.RESET}")
+          case UnspecifiedModules(choices) =>
+            val result =
+              choices.toSeq.sortBy(_._1).foldLeft(Seq.empty[String]) { case (acc, (module, choices)) =>
+                val nextLabel = Option(choices).filter(_.nonEmpty).fold("<no choices found>")(_.toSeq.sorted.mkString(", "))
+                acc :+ s"  ${AnsiColor.BOLD}${AnsiColor.WHITE}${module}:${AnsiColor.RESET} [${AnsiColor.BLUE}${nextLabel}${AnsiColor.RESET}]"
+              }
+            println(s"${AnsiColor.RED}Unsatisfied module(s):${AnsiColor.RESET}")
+            result.foreach(println)
+            throw new CodegenFailedException()
+          case UnusedModules(unused) =>
+            println(s"${AnsiColor.RED}Unused modules specified:${AnsiColor.RESET} ${unused.toList.mkString(", ")}")
             throw new CodegenFailedException()
         }, identity)
         //.runEmpty