Merge pull request #11 from ThoughtWorksInc/Atry-patch-1

Upgrade to Scala 2.13.0
ThoughtWorksInc · Jun 9, 2019 · 00bb8f1 · 00bb8f1
2 parents a4a8572 + 2ef3fb1
commit 00bb8f1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ addons:
 language: scala
 
 scala:
-  - "2.10.7"
-  - "2.11.12"
-  - "2.12.8"
-  - 2.13.0-RC1
+  - 2.10.7
+  - 2.11.12
+  - 2.12.8
+  - 2.13.0
 
 jdk:
   - oraclejdk8

diff --git a/comprehension-monad/build.sbt.shared b/comprehension-monad/build.sbt.shared
@@ -6,7 +6,14 @@ libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 
 libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
 
-libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1"
+libraryDependencies ++= {
+  import Ordering.Implicits._
+  if (VersionNumber(scalaVersion.value).numbers >= Seq(2L, 13L)) {
+    None
+  } else {
+    Some("org.typelevel" %% "macro-compat" % "1.1.1")
+  }
+}
 
 scalacOptions ++= {
   import Ordering.Implicits._

diff --git a/...onad/src/main/scala-2.13/com/thoughtworks/sde/comprehensionMonad/macrocompat/bundle.scala b/...onad/src/main/scala-2.13/com/thoughtworks/sde/comprehensionMonad/macrocompat/bundle.scala
@@ -0,0 +1,5 @@
+package com.thoughtworks.sde.comprehensionMonad.macrocompat
+
+import scala.annotation.Annotation
+
+private[comprehensionMonad] class bundle extends Annotation
diff --git a/core/build.sbt.shared b/core/build.sbt.shared
@@ -16,9 +16,16 @@ libraryDependencies ++= {
   }
 }
 
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
+libraryDependencies ++= {
+  import Ordering.Implicits._
+  if (VersionNumber(scalaVersion.value).numbers >= Seq(2L, 13L)) {
+    None
+  } else {
+    Some("org.typelevel" %% "macro-compat" % "1.1.1")
+  }
+}
 
-libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
 
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 

diff --git a/core/src/main/scala-2.13/com/thoughtworks/sde/core/macrocompat/bundle.scala b/core/src/main/scala-2.13/com/thoughtworks/sde/core/macrocompat/bundle.scala
@@ -0,0 +1,5 @@
+package com.thoughtworks.sde.core.macrocompat
+
+import scala.annotation.Annotation
+
+private[core] class bundle extends Annotation
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1
 
 addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")