Merge dev/surface into master

Author: Steve Salas

bytefrog/build.sbt

@@ -29,9 +29,7 @@ lazy val Instrumentation = (project in file("instrumentation"))
 		withTesting,
 
 		libraryDependencies ++= Dependencies.asm,
-		libraryDependencies += Dependencies.minlog,
-		libraryDependencies += Dependencies.logback,
-		libraryDependencies += Dependencies.slf4j
+		libraryDependencies += Dependencies.minlog
 	)
 
 lazy val FilterInjector = (project in file("filter-injector"))
@@ -42,9 +40,7 @@ lazy val FilterInjector = (project in file("filter-injector"))
 		javaWarnings,
 
 		libraryDependencies ++= Dependencies.asm,
-		libraryDependencies += Dependencies.minlog,
-		libraryDependencies += Dependencies.logback,
-		libraryDependencies += Dependencies.slf4j
+		libraryDependencies += Dependencies.minlog
 	)
 
 lazy val SourceMapParser = (project in file("sourcemap-parser"))
@@ -61,9 +57,7 @@ lazy val Util = (project in file("util"))
 		withTesting,
 
 		libraryDependencies ++= Dependencies.asm,
-		libraryDependencies += Dependencies.minlog,
-		libraryDependencies += Dependencies.logback,
-		libraryDependencies += Dependencies.slf4j
+		libraryDependencies += Dependencies.minlog
 	)
 
 lazy val Stack = (project in file("."))

bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/MethodInspector.java

@@ -22,8 +22,6 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
-import java.util.BitSet;
-
 /** Simple method visitor that collects source line information for a method (if available).
   *
   * @author robertf

bytefrog/project/Dependencies.scala

@@ -11,7 +11,4 @@ object Dependencies {
 	lazy val scalactic = "org.scalactic" %% "scalactic" % "3.0.4" % Test
 	lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.4" % Test
 	lazy val scalaMock = "org.scalamock" %% "scalamock" % "4.0.0" % Test
-
-	lazy val logback = "ch.qos.logback" % "logback-classic" % "0.9.26" % "compile->default"
-	lazy val slf4j = "org.slf4j" % "jcl-over-slf4j" % "1.6.4"
 }