From 3e626e39a1cdae0a376decaed27b842986a700e0 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Fri, 29 Nov 2019 14:45:14 -0800
Subject: Remove scala-logging fully in favor of our own logger

There was some vestigial logging that conflicts with the homebrewed
logger used by most of the codebase
---
 build.sbt                                           | 4 ----
 src/main/scala/firrtl/ExecutionOptionsManager.scala | 6 +++---
 src/main/scala/firrtl/Parser.scala                  | 2 +-
 src/main/scala/firrtl/PrimOps.scala                 | 2 +-
 src/test/scala/firrtlTests/FirrtlSpec.scala         | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 156d4138..f7b43fe7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -55,10 +55,6 @@ javacOptions ++= javacOptionsVersion(scalaVersion.value)
 
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0"
-
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
-
 // sbt 1.2.6 fails with `Symbol 'term org.junit' is missing from the classpath`
 // when compiling tests under 2.11.12
 // An explicit dependency on junit seems to alleviate this.
diff --git a/src/main/scala/firrtl/ExecutionOptionsManager.scala b/src/main/scala/firrtl/ExecutionOptionsManager.scala
index 3783db28..2e3cd096 100644
--- a/src/main/scala/firrtl/ExecutionOptionsManager.scala
+++ b/src/main/scala/firrtl/ExecutionOptionsManager.scala
@@ -2,14 +2,14 @@
 
 package firrtl
 
+import logger.LogLevel
+import logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
 import firrtl.annotations._
-import firrtl.Parser._
+import firrtl.Parser.{InfoMode, UseInfo, IgnoreInfo, GenInfo, AppendInfo}
 import firrtl.ir.Circuit
 import firrtl.passes.memlib.{InferReadWriteAnnotation, ReplSeqMemAnnotation}
 import firrtl.passes.clocklist.ClockListAnnotation
 import firrtl.transforms.NoCircuitDedupAnnotation
-import logger.LogLevel
-import logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
 import scopt.OptionParser
 import firrtl.stage.{CompilerAnnotation, FirrtlCircuitAnnotation, FirrtlFileAnnotation, FirrtlSourceAnnotation,
   InfoModeAnnotation, OutputFileAnnotation, RunFirrtlTransformAnnotation}
diff --git a/src/main/scala/firrtl/Parser.scala b/src/main/scala/firrtl/Parser.scala
index 4e26d642..ddc858e4 100644
--- a/src/main/scala/firrtl/Parser.scala
+++ b/src/main/scala/firrtl/Parser.scala
@@ -4,7 +4,7 @@ package firrtl
 
 import org.antlr.v4.runtime._
 import org.antlr.v4.runtime.atn._
-import com.typesafe.scalalogging.LazyLogging
+import logger.LazyLogging
 import firrtl.ir._
 import firrtl.Utils.time
 import firrtl.antlr.{FIRRTLParser, _}
diff --git a/src/main/scala/firrtl/PrimOps.scala b/src/main/scala/firrtl/PrimOps.scala
index 02404f70..cbe3a027 100644
--- a/src/main/scala/firrtl/PrimOps.scala
+++ b/src/main/scala/firrtl/PrimOps.scala
@@ -2,8 +2,8 @@
 
 package firrtl
 
+import logger.LazyLogging
 import firrtl.ir._
-import com.typesafe.scalalogging.LazyLogging
 import Implicits.{constraint2bound, constraint2width, width2constraint}
 import firrtl.constraint._
 
diff --git a/src/test/scala/firrtlTests/FirrtlSpec.scala b/src/test/scala/firrtlTests/FirrtlSpec.scala
index efbb27de..1ff5b72f 100644
--- a/src/test/scala/firrtlTests/FirrtlSpec.scala
+++ b/src/test/scala/firrtlTests/FirrtlSpec.scala
@@ -5,7 +5,7 @@ package firrtlTests
 import java.io._
 import java.security.Permission
 
-import com.typesafe.scalalogging.LazyLogging
+import logger.LazyLogging
 
 import scala.sys.process._
 import org.scalatest._
-- 
cgit v1.2.3