Address review comments

Author: sideeffffect

build.sbt

@@ -35,13 +35,10 @@ lazy val `portable-scala-reflect` = crossProject(JSPlatform, JVMPlatform, Native
     mimaPreviousArtifacts +=
       organization.value %%% moduleName.value % previousVersion,
     mimaBinaryIssueFilters ++= List(
+      /* Macros were moved to `internal` package so that `Reflect`'s metadata doesn't get polluted by types from `scala-reflect` */
       ProblemFilters.exclude[DirectMissingMethodProblem]("org.portablescala.reflect.Reflect.lookupInstantiatableClass_impl"),
       ProblemFilters.exclude[DirectMissingMethodProblem]("org.portablescala.reflect.Reflect.lookupLoadableModuleClass_impl"),
-      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$"),
-      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$Scope1$"),
-      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$Scope1$blackbox$"),
-      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$Scope2$"),
-      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$Scope2$Inner$"),
+      ProblemFilters.exclude[MissingClassProblem]("org.portablescala.reflect.Reflect$MacroCompat$*"),
     ),
 
     publishMavenStyle := true,

jvm/src/main/scala/org/portablescala/reflect/Reflect.scala

@@ -1,74 +1,13 @@
 package org.portablescala.reflect
 
 import scala.language.experimental.macros
-
 import scala.collection.mutable
-
 import java.lang.reflect._
-
 import org.portablescala.reflect.annotation._
+import org.portablescala.reflect.internal.Macros
 
 object Reflect {
 
-  // Macro definitions are enclosed in a dedicated `Macros` object,
-  // so that their metadata (the types involved etc.) don't pollute `Reflect`'s metadata.
-  // This enables using `Reflect`'s methods without `scala-reflect` JAR
-  // https://github.com/scala/bug/issues/8090
-  // https://github.com/xeno-by/sbt-example-paradise210/issues/1#issuecomment-20996354
-  object Macros {
-    /** Magic to get cross-compiling access to `blackbox.Context` with a fallback
-     *  on `macros.Context`, without deprecation warning in any Scala version.
-     */
-    private object MacroCompat {
-      object Scope1 {
-        object blackbox
-      }
-      import Scope1._
-
-      object Scope2 {
-        import scala.reflect.macros._
-        object Inner {
-          import blackbox._
-          type BlackboxContext = Context
-        }
-      }
-    }
-
-    import MacroCompat.Scope2.Inner.BlackboxContext
-
-    private def currentClassLoaderExpr(
-        c: BlackboxContext { type PrefixType = Reflect.type }): c.Expr[ClassLoader] = {
-      import c.universe._
-      val enclosingClassTree = c.reifyEnclosingRuntimeClass
-      if (enclosingClassTree.isEmpty)
-        c.abort(c.enclosingPosition, "call site does not have an enclosing class")
-      val enclosingClassExpr = c.Expr[java.lang.Class[_]](enclosingClassTree)
-      reify {
-        enclosingClassExpr.splice.getClassLoader()
-      }
-    }
-
-    def lookupLoadableModuleClass(
-        c: BlackboxContext { type PrefixType = Reflect.type })(
-        fqcn: c.Expr[String]): c.Expr[Option[LoadableModuleClass]] = {
-      import c.universe._
-      val loaderExpr = currentClassLoaderExpr(c)
-      reify {
-        c.prefix.splice.lookupLoadableModuleClass(fqcn.splice, loaderExpr.splice)
-      }
-    }
-
-    def lookupInstantiatableClass(
-        c: BlackboxContext { type PrefixType = Reflect.type })(
-        fqcn: c.Expr[String]): c.Expr[Option[InstantiatableClass]] = {
-      import c.universe._
-      val loaderExpr = currentClassLoaderExpr(c)
-      reify {
-        c.prefix.splice.lookupInstantiatableClass(fqcn.splice, loaderExpr.splice)
-      }
-    }
-  }
-
   /** Reflectively looks up a loadable module class using the current class
    *  loader.
    *

jvm/src/main/scala/org/portablescala/reflect/internal/Macros.scala

@@ -0,0 +1,63 @@
+package org.portablescala.reflect.internal
+
+import org.portablescala.reflect._
+
+/* Macro definitions are enclosed in a dedicated `Macros` object,
+ * so that their metadata (the types involved etc.) don't pollute `Reflect`'s metadata.
+ * This enables using `Reflect`'s methods without `scala-reflect` JAR
+ * https://github.com/scala/bug/issues/8090
+ * https://github.com/xeno-by/sbt-example-paradise210/issues/1#issuecomment-20996354
+ */
+object Macros {
+  /** Magic to get cross-compiling access to `blackbox.Context` with a fallback
+   *  on `macros.Context`, without deprecation warning in any Scala version.
+   */
+  private object MacroCompat {
+    object Scope1 {
+      object blackbox
+    }
+    import Scope1._
+
+    object Scope2 {
+      import scala.reflect.macros._
+      object Inner {
+        import blackbox._
+        type BlackboxContext = Context
+      }
+    }
+  }
+
+  import MacroCompat.Scope2.Inner.BlackboxContext
+
+  private def currentClassLoaderExpr(
+      c: BlackboxContext { type PrefixType = Reflect.type }): c.Expr[ClassLoader] = {
+    import c.universe._
+    val enclosingClassTree = c.reifyEnclosingRuntimeClass
+    if (enclosingClassTree.isEmpty)
+      c.abort(c.enclosingPosition, "call site does not have an enclosing class")
+    val enclosingClassExpr = c.Expr[java.lang.Class[_]](enclosingClassTree)
+    reify {
+      enclosingClassExpr.splice.getClassLoader()
+    }
+  }
+
+  def lookupLoadableModuleClass(
+      c: BlackboxContext { type PrefixType = Reflect.type })(
+      fqcn: c.Expr[String]): c.Expr[Option[LoadableModuleClass]] = {
+    import c.universe._
+    val loaderExpr = currentClassLoaderExpr(c)
+    reify {
+      c.prefix.splice.lookupLoadableModuleClass(fqcn.splice, loaderExpr.splice)
+    }
+  }
+
+  def lookupInstantiatableClass(
+      c: BlackboxContext { type PrefixType = Reflect.type })(
+      fqcn: c.Expr[String]): c.Expr[Option[InstantiatableClass]] = {
+    import c.universe._
+    val loaderExpr = currentClassLoaderExpr(c)
+    reify {
+      c.prefix.splice.lookupInstantiatableClass(fqcn.splice, loaderExpr.splice)
+    }
+  }
+}