Remove 'com.typesafe.scala-logging:scala-logging' dependency

Add macros directly to plugin's test sources. `test-classes` directory will be added to the class path instead of `scala-logging` dependencies.

Maybe it's not an elegant solution, but it is simple and does not require any external dependencies.

Author: gslowikowski

build.sbt

@@ -79,17 +79,27 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
     .dependsOn(`scalac-scoverage-runtimeJVM` % "test")
     .settings(name := "scalac-scoverage-plugin")
     .settings(appSettings: _*)
-    .settings(libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % ScalatestVersion % "test",
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
-  )).settings(libraryDependencies ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
-        "org.scala-lang.modules" %% "scala-xml" % "1.1.1",
-        "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0" % "test"
+    .settings(
+      libraryDependencies ++= Seq(
+        "org.scalatest" %% "scalatest" % ScalatestVersion % "test",
+        "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
       )
-      case _ => Seq(
-        "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"
-      )
-    }
-  })
+    )
+    .settings(
+      unmanagedSourceDirectories in Test ++= {
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((2, scalaMajor)) if scalaMajor > 10 =>
+            Seq((sourceDirectory in Test).value / "scala-2.11+")
+          case _ =>
+            Seq()
+        }
+      },
+      libraryDependencies ++= {
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((2, scalaMajor)) if scalaMajor > 10 =>
+            Seq("org.scala-lang.modules" %% "scala-xml" % "1.1.1")
+          case _ =>
+            Seq()
+        }
+      }
+    )

scalac-scoverage-plugin/src/test/scala-2.10/scoverage/macrosupport/TesterMacro.scala

@@ -0,0 +1,14 @@
+package scoverage.macrosupport
+
+import scala.reflect.macros.Context
+
+private object TesterMacro {
+
+  type TesterContext = Context { type PrefixType = Tester.type }
+
+  def test(c: TesterContext) =
+    c.universe.reify(
+      println("macro test")
+    )
+
+}

scalac-scoverage-plugin/src/test/scala-2.11+/scoverage/macrosupport/TesterMacro.scala

@@ -0,0 +1,14 @@
+package scoverage.macrosupport
+
+import scala.reflect.macros.blackbox.Context
+
+private object TesterMacro {
+
+  type TesterContext = Context { type PrefixType = Tester.type }
+
+  def test(c: TesterContext) = {
+    import c.universe._
+    q"""println("macro test")"""
+  }
+
+}

scalac-scoverage-plugin/src/test/scala/scoverage/MacroSupport.scala

@@ -0,0 +1,11 @@
+package scoverage
+
+import java.io.File
+
+trait MacroSupport {
+
+  val macroSupportDeps = Seq(testClasses)
+
+  private def testClasses: File = new File(s"./scalac-scoverage-plugin/target/scala-${ScoverageCompiler.ShortScalaVersion}/test-classes")
+
+}

scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.scala

@@ -7,7 +7,7 @@ class PluginASTSupportTest
   extends FunSuite
   with OneInstancePerTest
   with BeforeAndAfterEachTestData
-  with ScalaLoggingSupport {
+  with MacroSupport {
 
   override protected def afterEach(testData: TestData): Unit = {
     val compiler = ScoverageCompiler.default
@@ -145,12 +145,11 @@ class PluginASTSupportTest
   // https://github.com/skinny-framework/skinny-framework/issues/97
   test("macro range positions should not break plugin") {
     val compiler = ScoverageCompiler.default
-    scalaLoggingDeps.foreach(compiler.addToClassPath(_))
-    compiler.compileCodeSnippet( s"""import ${scalaLoggingPackageName}.StrictLogging
+    macroSupportDeps.foreach(compiler.addToClassPath(_))
+    compiler.compileCodeSnippet( s"""import scoverage.macrosupport.Tester
                           |
-                          |object MacroTest extends StrictLogging {
-                          |  println("Hello")
-                          |  logger.info("will break")
+                          |object MacroTest {
+                          | Tester.test
                           |} """.stripMargin)
     assert(!compiler.reporter.hasErrors)
     assert(!compiler.reporter.hasWarnings)

scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala

@@ -7,7 +7,7 @@ class PluginCoverageTest
   extends FunSuite
   with OneInstancePerTest
   with BeforeAndAfterEachTestData
-  with ScalaLoggingSupport {
+  with MacroSupport {
 
   test("scoverage should instrument default arguments with methods") {
     val compiler = ScoverageCompiler.default
@@ -285,12 +285,13 @@ class PluginCoverageTest
     compiler.assertNoCoverage()
   }
 
-  test("plugin should not instrument expanded macro code github.com/skinny-framework/skinny-framework/issues/97") {
+  test("plugin should not instrument expanded macro code http://github.com/skinny-framework/skinny-framework/issues/97") {
     val compiler = ScoverageCompiler.default
-    scalaLoggingDeps.foreach(compiler.addToClassPath(_))
-    compiler.compileCodeSnippet( s"""import ${scalaLoggingPackageName}.StrictLogging
-                                   |class MacroTest extends StrictLogging {
-                                   |  logger.info("will break")
+    macroSupportDeps.foreach(compiler.addToClassPath(_))
+    compiler.compileCodeSnippet( s"""import scoverage.macrosupport.Tester
+                                   |
+                                   |class MacroTest {
+                                   |  Tester.test
                                    |} """.stripMargin)
     assert(!compiler.reporter.hasErrors)
     assert(!compiler.reporter.hasWarnings)

scalac-scoverage-plugin/src/test/scala/scoverage/ScalaLoggingSupport.scala

@@ -0,0 +1,9 @@
+package scoverage.macrosupport
+
+import scala.language.experimental.macros
+
+object Tester {
+
+  def test: Unit = macro TesterMacro.test
+
+}