Merge pull request #52 from hmrc/commons-codec

Drop unused commons-codec dependency
hmrc · Aug 10, 2022 · cae9c62 · cae9c62
2 parents 87a5a92 + 5d4d56b
commit cae9c62
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,14 +6,13 @@ lazy val root = (project in file("."))
     sbtPlugin        := true,
     majorVersion     := 4,
     isPublicArtefact := true,
-    scalaVersion     := "2.12.10",
+    scalaVersion     := "2.12.16",
     crossSbtVersions := Vector("1.3.13"),
     // Use the code from the sbt-dependency-graph plugin as if it was a standard library dependency
     // We use the plugin to resolve the complete module graph for the purpose of validating bobby
     // rule violations across transitive dependencies
     addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1"),
     libraryDependencies ++= Seq(
-      "commons-codec"         %  "commons-codec"              % "1.14",
       "com.lihaoyi"           %% "fansi"                      % "0.2.6",
       "com.typesafe.play"     %% "play-json"                  % "2.9.2",
       "org.scalatest"         %% "scalatest"                  % "3.1.0"         % Test,

diff --git a/src/main/scala/uk/gov/hmrc/SbtBobbyPlugin.scala b/src/main/scala/uk/gov/hmrc/SbtBobbyPlugin.scala
@@ -34,24 +34,23 @@ object SbtBobbyPlugin extends AutoPlugin {
 
   // Environment variable keys for customising bobby
   object BobbyEnvKeys {
-    lazy val envKeyBobbyViewType = "BOBBY_VIEW_TYPE"
-    lazy val envKeyBobbyStrictMode = "BOBBY_STRICT_MODE"
+    lazy val envKeyBobbyViewType       = "BOBBY_VIEW_TYPE"
+    lazy val envKeyBobbyStrictMode     = "BOBBY_STRICT_MODE"
     lazy val envKeyBobbyConsoleColours = "BOBBY_CONSOLE_COLOURS"
   }
 
   object BobbyKeys {
-    lazy val validate        = TaskKey[Unit]("validate", "Run Bobby to validate dependencies")
-    lazy val bobbyRulesURL =
-      SettingKey[Option[URL]]("bobbyRulesURL", "Override the URL used to get the list of bobby rules")
-    lazy val outputDirectoryOverride =
-      SettingKey[Option[String]]("outputDirectoryOverride", "Override the directory used to write the report files")
-    lazy val bobbyStrictMode = settingKey[Boolean]("If true, bobby will fail on warnings as well as violations")
-    lazy val bobbyViewType = settingKey[ViewType]("View type for display: Flat/Nested/Compact")
-    lazy val bobbyConsoleColours = settingKey[Boolean]("If true (default), colours are rendered in the console output")
+    lazy val validate                = taskKey[Unit]("Run Bobby to validate dependencies")
+    lazy val bobbyRulesURL           = settingKey[Option[URL]]("Override the URL used to get the list of bobby rules")
+    lazy val outputDirectoryOverride = settingKey[Option[String]]("Override the directory used to write the report files")
+    lazy val bobbyStrictMode         = settingKey[Boolean]("If true, bobby will fail on warnings as well as violations")
+    lazy val bobbyViewType           = settingKey[ViewType]("View type for display: Flat/Nested/Compact")
+    lazy val bobbyConsoleColours     = settingKey[Boolean]("If true (default), colours are rendered in the console output")
   }
 
   def validateSettings: Seq[Def.Setting[_]] =
-    Seq(Compile, Test, IntegrationTest, Runtime, Provided, Optional).flatMap(validateTaskForConfig)
+    Seq(Compile, Test, IntegrationTest, Runtime, Provided, Optional)
+      .flatMap(validateTaskForConfig)
 
   // Define the validate task for the given configuration
   def validateTaskForConfig(config: Configuration): Seq[Def.Setting[_]] = inConfig(config)(
@@ -60,12 +59,15 @@ object SbtBobbyPlugin extends AutoPlugin {
         // Determine nodes to exclude which are this project or dependent projects from this build
         // Required so multi-project builds with modules that depend on each other don't cause a violation of a SNAPSHOT dependency
         val extractedRootProject = Project.extract(state.value)
-        val internalModuleNodes = buildStructure.value.allProjectRefs.map( p =>
-          extractedRootProject.get(projectID in p)
-        ).distinct.map(_.toDependencyGraph)
+        val internalModuleNodes =
+          buildStructure.value
+          .allProjectRefs
+          .map(p => extractedRootProject.get(p / projectID))
+          .distinct
+          .map(_.toDependencyGraph)
 
         // Construct a complete module graph piggy-backing off `sbt-dependency-graph`
-        val projectDependencyGraph: ModuleGraph = GraphOps.cleanGraph((moduleGraph in config).value, excludeNodes = internalModuleNodes)
+        val projectDependencyGraph: ModuleGraph = GraphOps.cleanGraph((config / moduleGraph).value, excludeNodes = internalModuleNodes)
 
         // Retrieve just the resolved module IDs, in topologically sorted order
         val projectDependencies = GraphOps.topoSort(GraphOps.transpose(projectDependencyGraph))
@@ -77,13 +79,13 @@ object SbtBobbyPlugin extends AutoPlugin {
         val bobbyConfigFile: ConfigFile = ConfigFileImpl(System.getProperty("user.home") + "/.sbt/bobby.conf")
 
         val bobbyConfig = new BobbyConfiguration(
-          bobbyRulesURL = bobbyRulesURL.value,
+          bobbyRulesURL           = bobbyRulesURL.value,
           outputDirectoryOverride = outputDirectoryOverride.value,
-          outputFileName = s"bobby-report-${thisProject.value.id}-${config.name}",
-          bobbyConfigFile = Some(bobbyConfigFile),
-          strictMode = bobbyStrictMode.value,
-          viewType = bobbyViewType.value,
-          consoleColours = bobbyConsoleColours.value
+          outputFileName          = s"bobby-report-${thisProject.value.id}-${config.name}",
+          bobbyConfigFile         = Some(bobbyConfigFile),
+          strictMode              = bobbyStrictMode.value,
+          viewType                = bobbyViewType.value,
+          consoleColours          = bobbyConsoleColours.value
         )
 
         val projectName = name.value
@@ -99,11 +101,11 @@ object SbtBobbyPlugin extends AutoPlugin {
   )
 
   override lazy val projectSettings = Seq(
-    bobbyRulesURL := None,
-    outputDirectoryOverride := None,
-    parallelExecution in GlobalScope := true,
-    bobbyViewType := sys.env.get(envKeyBobbyViewType).map(ViewType.apply).getOrElse(Compact),
-    bobbyStrictMode := sys.env.get(envKeyBobbyStrictMode).map(_.toBoolean).getOrElse(false),
+    bobbyRulesURL                   := None,
+    outputDirectoryOverride         := None,
+    GlobalScope / parallelExecution := true,
+    bobbyViewType       := sys.env.get(envKeyBobbyViewType).map(ViewType.apply).getOrElse(Compact),
+    bobbyStrictMode     := sys.env.get(envKeyBobbyStrictMode).map(_.toBoolean).getOrElse(false),
     bobbyConsoleColours := sys.env.get(envKeyBobbyConsoleColours).map(_.toBoolean).getOrElse(true)
   ) ++ validateSettings ++
     //Add a useful alias to run bobby validate for compile, test and plugins together (similar to old releases of bobby)