Skip to content

Commit

Permalink
scala 2.12 (drop 2.10/2.11)
Browse files Browse the repository at this point in the history
  • Loading branch information
solar committed Jan 23, 2017
1 parent 621058a commit bdd867b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 30 deletions.
28 changes: 2 additions & 26 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,17 @@ name := "regexmacro"

organization := "org.sazabi"

scalaVersion := "2.11.8"

crossScalaVersions := Seq(scalaVersion.value, "2.10.6")
scalaVersion := "2.12.1"

libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
"org.typelevel" %% "macro-compat" % "1.1.1",
"org.scalatest" %% "scalatest" % "2.2.6" % "test",
compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
"org.scalatest" %% "scalatest" % "3.0.1" % "test"
)

libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major >= 11 => Seq(
"org.scala-lang.modules" %% "scala-java8-compat" % "0.7.0")

case Some((2, 10)) => Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
"org.scalamacros" %% "quasiquotes" % "2.1.0")
}
}

incOptions := incOptions.value.withNameHashing(true)
updateOptions := updateOptions.value.withCachedResolution(true)

scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major >= 11 =>
Seq("-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
case _ => Seq.empty
}
}

releasePublishArtifactsAction := PgpKeys.publishSigned.value
releaseCrossBuild := true

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.11
sbt.version=0.13.13
3 changes: 0 additions & 3 deletions src/main/scala/org/sazabi/regexmacro/Impl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import java.util.regex.Pattern
import scala.language.experimental.macros
import scala.reflect.macros.whitebox

import macrocompat.bundle

@bundle
class Impl(val c: whitebox.Context) {
import c.universe._

Expand Down

0 comments on commit bdd867b

Please sign in to comment.