diff --git a/.travis.yml b/.travis.yml index 3960508..0d53cba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ cache: language: scala scala: - - "2.10.7" - "2.11.12" - "2.12.7" - "2.13.0-M5" diff --git a/build.sbt b/build.sbt index 35baa75..638506f 100644 --- a/build.sbt +++ b/build.sbt @@ -51,7 +51,7 @@ lazy val commonSettings = Seq( scalacOptions in (Compile, console) ~= { _ filterNot { o => o == "-Ywarn-unused-import" || o == "-Xfatal-warnings" } }, scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, scalaVersion := Scala211, - crossScalaVersions := Seq("2.10.7", Scala211, "2.12.7", "2.13.0-M5"), + crossScalaVersions := Seq(Scala211, "2.12.7", "2.13.0-M5"), resolvers ++= Seq( Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots") @@ -149,7 +149,6 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform).crossType( .settings(commonSettings: _*) .settings( moduleName := "simulacrum", - libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1", scalacOptions in (Test) += "-Yno-imports" ) .settings(scalaMacroDependencies:_*) diff --git a/core/src/main/scala/simulacrum/typeclass.scala b/core/src/main/scala/simulacrum/typeclass.scala index e1be948..6788d81 100644 --- a/core/src/main/scala/simulacrum/typeclass.scala +++ b/core/src/main/scala/simulacrum/typeclass.scala @@ -4,8 +4,6 @@ import scala.annotation.{ compileTimeOnly, StaticAnnotation } import scala.language.experimental.macros import scala.reflect.macros.whitebox.Context -import macrocompat._ - /** * Annotation that may be applied to methods on a type that is annotated with `@typeclass`. * @@ -52,7 +50,6 @@ class typeclass(excludeParents: List[String] = Nil, generateAllOps: Boolean = tr def macroTransform(annottees: Any*): Any = macro TypeClassMacros.generateTypeClass } -@bundle class TypeClassMacros(val c: Context) { import c.universe._