Upgrade to Scalameta 4.1.9 (#960)

Upgrade to Scalameta 4.1.9
scalacenter · May 9, 2019 · 19c3c97 · 19c3c97
2 parents d069c1e + cded7b5
commit 19c3c97
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/build.sbt b/build.sbt
@@ -56,8 +56,6 @@ lazy val core = project
     buildInfoSettings,
     libraryDependencies ++= List(
       scalameta,
-      symtab,
-      metap,
       googleDiff,
       "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
@@ -79,7 +77,6 @@ lazy val reflect = project
     moduleName := "scalafix-reflect",
     isFullCrossVersion,
     libraryDependencies ++= Seq(
-      metacp,
       "org.scala-lang" % "scala-compiler" % scalaVersion.value,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value
     )
@@ -243,7 +240,7 @@ lazy val docs = project
     crossScalaVersions := List(scala212),
     libraryDependencies ++= List(
       "com.geirsson" %% "metaconfig-docs" % metaconfigV,
-      "org.scalameta" % "interactive" % scalametaV cross CrossVersion.full
+      "org.scalameta" % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
     )
   )
   .dependsOn(testkit, core, cli)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 /* scalafmt: { maxColumn = 120 }*/
 
 object Dependencies {
-  val scalametaV = "4.1.5"
+  val scalametaV = "4.1.9"
   val metaconfigV = "0.9.1"
   def dotty = "0.9.0-RC1"
   def scala210 = "2.10.6"
@@ -19,9 +19,7 @@ object Dependencies {
 
   def metacp = "org.scalameta" %% "metacp" % scalametaV
   def semanticdbPluginLibrary = "org.scalameta" % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
-  def scalameta = "org.scalameta" %% "contrib" % scalametaV
-  def symtab = "org.scalameta" %% "symtab" % scalametaV
-  def metap = "org.scalameta" %% "metap" % scalametaV
+  def scalameta = "org.scalameta" %% "scalameta" % scalametaV
   def scalatest = "org.scalatest" %% "scalatest" % "3.2.0-SNAP10"
   def scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -11,4 +11,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
 addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.22")
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.8")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.10")
diff --git a/scalafix-tests/unit/src/main/resources/expect/Pretty.expect b/scalafix-tests/unit/src/main/resources/expect/Pretty.expect
@@ -1,17 +1,17 @@
 [6:7..6:17]:      test/PrettyTest# => class PrettyTest extends AnyRef { +4 decls }
 [6:18..6:18]:     test/PrettyTest#`<init>`(). => primary ctor <init>()
-[7:3..7:21]:      *(canBuildFrom[Int])
+[7:3..7:21]:      *(List.canBuildFrom[Int])
 [7:3..7:14]:      *[Int,List[Int]]
 [7:3..7:7]:       *.apply[Int]
 [8:3..12:12]:     orig(1.to(10)).flatMap[Int,IndexedSeq[Int]](
                     { (i) =>
                       orig(2.to(20)).withFilter(
                         { (j) => orig(i > i) }
                       ).map[Int,IndexedSeq[Int]]({ (j) => orig(j) })(
-                        canBuildFrom[Int]
+                        IndexedSeq.canBuildFrom[Int]
                       )
                     }
-                  )(canBuildFrom[Int])
+                  )(IndexedSeq.canBuildFrom[Int])
 [9:10..9:11]:     intWrapper(*)
 [10:10..10:11]:   intWrapper(*)
 [13:3..17:15]:    orig(Future(1.to(10)))(global).foreach[Unit](

diff --git a/scalafix-tests/unit/src/test/scala/scalafix/tests/v0/LegacySyntheticsSuite.scala b/scalafix-tests/unit/src/test/scala/scalafix/tests/v0/LegacySyntheticsSuite.scala
@@ -10,10 +10,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
     val obtained = synthetics.sortBy(_.position.start).mkString("\n")
     val expected =
       """
-        |[221..226): *(canBuildFrom[Int])
+        |[221..226): *(List.canBuildFrom[Int])
         |  [0..1): * => _star_.
-        |  [2..14): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
-        |  [15..18): Int => scala/Int#
+        |  [2..6): List => scala/collection/immutable/List.
+        |  [7..19): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
+        |  [20..23): Int => scala/Int#
         |[221..226): *[List]
         |  [0..1): * => _star_.
         |  [2..6): List => scala/package.List#
@@ -22,10 +23,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
         |  [2..5): Int => scala/Int#
         |  [7..10): Set => scala/Predef.Set#
         |  [11..14): Int => scala/Int#
-        |[245..253): *(canBuildFrom[Int])
+        |[245..253): *(Set.canBuildFrom[Int])
         |  [0..1): * => _star_.
-        |  [2..14): canBuildFrom => scala/collection/immutable/Set.canBuildFrom().
-        |  [15..18): Int => scala/Int#
+        |  [2..5): Set => scala/collection/immutable/Set.
+        |  [6..18): canBuildFrom => scala/collection/immutable/Set.canBuildFrom().
+        |  [19..22): Int => scala/Int#
         |[245..253): *[List[Int], Int, Set[Int]]
         |  [0..1): * => _star_.
         |  [2..6): List => scala/collection/immutable/List#
@@ -49,10 +51,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
         |  [0..1): * => _star_.
         |  [2..7): apply => scala/concurrent/Future.apply().
         |  [8..11): Int => scala/Int#
-        |[301..309): *(canBuildFrom[Int])
+        |[301..309): *(List.canBuildFrom[Int])
         |  [0..1): * => _star_.
-        |  [2..14): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
-        |  [15..18): Int => scala/Int#
+        |  [2..6): List => scala/collection/immutable/List.
+        |  [7..19): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
+        |  [20..23): Int => scala/Int#
         |[301..309): *[List[Future[Int]], Int, List[Int]]
         |  [0..1): * => _star_.
         |  [2..6): List => scala/collection/immutable/List#