Remove macro-compat

outworkers · Apr 6, 2021 · ebe1851 · ebe1851
1 parent db1300f
commit ebe1851
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 24 deletions.
diff --git a/build.sbt b/build.sbt
@@ -123,14 +123,12 @@ lazy val Versions = new {
   val joda = "2.10.1"
   val jodaConvert = "2.1.2"
   val scalamock = "4.4.0"
-  val macrocompat = "1.1.1"
   val macroParadise = "2.1.1"
   val circe = "0.12.3"
   val scala211 = "2.11.12"
   val scala212 = "2.12.10"
   val scala213 = "2.13.1"
   val monix = "3.1.0-2156c0e"
-  val macroCompat = "1.1.1"
   val collectionCompat = "2.1.3"
   val paradise = "2.1.1"
 
@@ -155,14 +153,6 @@ lazy val Versions = new {
     "1.2.0"
   }
 
-
-  val macroCompatVersion: String => ModuleID = {
-    s => CrossVersion.partialVersion(s) match {
-      case Some((_, minor)) if minor >= 13 => "org.typelevel" % "macro-compat_2.13.0-RC2" % "1.1.1"
-      case Some((_, minor)) if minor < 13 => "org.typelevel" %% "macro-compat" % macroCompat
-    }
-  }
-
   val paradiseVersion: String => Seq[ModuleID] = {
     s => CrossVersion.partialVersion(s) match {
       case Some((_, minor)) if minor >= 13 =>
@@ -324,7 +314,6 @@ lazy val readme = (project in file("readme"))
       "VERSION" -> version.value
     ),
     libraryDependencies ++= Seq(
-      Versions.macroCompatVersion(scalaVersion.value),
       "org.scala-lang" % "scala-compiler" % scalaVersion.value,
       "com.outworkers" %% "util-samplers" % Versions.util,
       "io.circe" %% "circe-parser" % Versions.circeVersion(scalaVersion.value),
@@ -350,7 +339,6 @@ lazy val phantomDsl = (project in file("phantom-dsl"))
       Tags.limit(Tags.ForkedTestGroup, defaultConcurrency)
     ),
     libraryDependencies ++= Seq(
-      Versions.macroCompatVersion(scalaVersion.value),
       "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
       "com.chuusai"                  %% "shapeless"                         % Versions.shapeless,
       "joda-time"                    %  "joda-time"                         % Versions.joda,
@@ -405,7 +393,6 @@ lazy val phantomThrift = (project in file("phantom-thrift"))
     name := "phantom-thrift",
     moduleName := "phantom-thrift",
     libraryDependencies ++= Seq(
-      Versions.macroCompatVersion(scalaVersion.value),
       "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
       "org.apache.thrift"            % "libthrift"                          % Versions.thrift,
       "com.twitter"                  %% "scrooge-core"                      % Versions.scrooge(scalaVersion.value),

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/builder/primitives/PrimitiveMacro.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/builder/primitives/PrimitiveMacro.scala
@@ -21,7 +21,6 @@ import com.datastax.driver.core.exceptions.InvalidTypeException
 import com.outworkers.phantom.macros.toolbelt.BlackboxToolbelt
 import scala.reflect.macros.blackbox
 
-@macrocompat.bundle
 class PrimitiveMacro(override val c: blackbox.Context) extends BlackboxToolbelt {
   import c.universe._
 

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/BindHelper.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/BindHelper.scala
@@ -42,7 +42,6 @@ object BindHelper {
   implicit def materialize[TP]: BindHelper[TP] = macro BindMacros.materialize[TP]
 }
 
-@macrocompat.bundle
 class BindMacros(override val c: whitebox.Context) extends WhiteboxToolbelt with RootMacro {
 
   import c.universe._

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/DatabaseHelper.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/DatabaseHelper.scala
@@ -36,7 +36,6 @@ object DatabaseHelper {
   ]: DatabaseHelper[T] = macro DatabaseHelperMacro.materialize[T]
 }
 
-@macrocompat.bundle
 class DatabaseHelperMacro(override val c: whitebox.Context) extends WhiteboxToolbelt with RootMacro {
   import c.universe._
 

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/HListEqs.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/HListEqs.scala
@@ -44,7 +44,6 @@ object ==:== {
 }
 
 
-@macrocompat.bundle
 class EqsMacro(val c: whitebox.Context) extends WhiteboxToolbelt with HListHelpers {
 
   import c.universe._

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/RootMacro.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/RootMacro.scala
@@ -27,7 +27,6 @@ import scala.collection.immutable.ListMap
 import scala.reflect.macros.whitebox
 import scala.Iterable
 
-@macrocompat.bundle
 trait RootMacro extends HListHelpers with WhiteboxToolbelt {
   val c: whitebox.Context
   import c.universe._

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/SingleGeneric.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/SingleGeneric.scala
@@ -72,7 +72,6 @@ object SingleGeneric {
 }
 
 
-@macrocompat.bundle
 class SingleGenericMacro(val c: whitebox.Context) extends HListHelpers with WhiteboxToolbelt {
   import c.universe._
 

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala
@@ -62,7 +62,6 @@ object TableHelper {
   type Aux[T <: CassandraTable[T, R], R, Repr0] = TableHelper[T, R] { type Repr = Repr0 }
 }
 
-@macrocompat.bundle
 class TableHelperMacro(override val c: whitebox.Context) extends WhiteboxToolbelt with RootMacro {
   import c.universe._
 

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/BlackboxToolbelt.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/BlackboxToolbelt.scala
@@ -33,7 +33,6 @@ private[phantom] object BlackboxToolbelt {
   final val specialEqsCache: Cache = new Cache()
 }
 
-@macrocompat.bundle
 private[phantom] trait BlackboxToolbelt {
 
   val c: blackbox.Context

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/HListHelpers.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/HListHelpers.scala
@@ -22,7 +22,6 @@ import scala.reflect.macros.whitebox
 import scala.util.control.NonFatal
 import scala.collection.compat._
 
-@macrocompat.bundle
 trait HListHelpers {
   val c: whitebox.Context
 

diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/WhiteboxToolbelt.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/toolbelt/WhiteboxToolbelt.scala
@@ -34,7 +34,6 @@ private[phantom] object WhiteboxToolbelt {
   final val specialEqsCache: Cache = new Cache()
 }
 
-@macrocompat.bundle
 private[phantom] trait WhiteboxToolbelt {
 
   val c: whitebox.Context

diff --git a/phantom-thrift/src/main/scala/com/outworkers/phantom/thrift/ThriftHelper.scala b/phantom-thrift/src/main/scala/com/outworkers/phantom/thrift/ThriftHelper.scala
@@ -38,7 +38,6 @@ object ThriftHelper {
   ]: ThriftHelper[T, Serializer] = macro ThriftHelperMacro.materialize[T, Serializer]
 }
 
-@macrocompat.bundle
 class ThriftHelperMacro(val c: blackbox.Context) {
 
   import c.universe._