Merge pull request #98 from cquiroz/0.5.x-2.13

Add support for scala 2.13-M1
cquiroz · Sep 18, 2017 · 96ba14d · 96ba14d
2 parents 4ae1395 + a671601
commit 96ba14d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,9 @@ sudo: false
 language: scala
 scala:
   - 2.10.6
-  - 2.11.8
-  - 2.12.2
+  - 2.11.11
+  - 2.12.3
+  - 2.13.0-M2
 jdk:
   - oraclejdk8
 env:

diff --git a/build.sbt b/build.sbt
@@ -10,7 +10,7 @@ val commonSettings: Seq[Setting[_]] = Seq(
   version := s"0.5.5-cldr${cldrVersion.value}",
   organization := "io.github.cquiroz",
   scalaVersion := "2.11.11",
-  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"),
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3", "2.13.0-M2"),
     scalacOptions ++= Seq("-deprecation", "-feature"),
   scalacOptions := {
     CrossVersion.partialVersion(scalaVersion.value) match {

diff --git a/macroUtils/src/main/scala-2.13.0-M2/TreeHelper.scala b/macroUtils/src/main/scala-2.13.0-M2/TreeHelper.scala
@@ -0,0 +1,10 @@
+package io.github.cquiroz.utils
+
+import scala.reflect.macros.Context
+
+object TreeHelper {
+
+  def resetLong(c: Context)(v: c.Expr[Long]): c.Expr[Long] =
+    c.Expr[Long](v.tree.duplicate)
+
+}
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,9 @@ sudo: false @@
     language: scala
     scala:
       - 2.10.6
-      - 2.11.8
-      - 2.12.2
+      - 2.11.11
+      - 2.12.3
+      - 2.13.0-M2
     jdk:
       - oraclejdk8
     env:
@@ Expand Down @@