Skip to content

Commit 19c3c97

Browse files
authored
Upgrade to Scalameta 4.1.9 (#960)
Upgrade to Scalameta 4.1.9
2 parents d069c1e + cded7b5 commit 19c3c97

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

build.sbt

+1-4
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ lazy val core = project
5656
buildInfoSettings,
5757
libraryDependencies ++= List(
5858
scalameta,
59-
symtab,
60-
metap,
6159
googleDiff,
6260
"com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV,
6361
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
@@ -79,7 +77,6 @@ lazy val reflect = project
7977
moduleName := "scalafix-reflect",
8078
isFullCrossVersion,
8179
libraryDependencies ++= Seq(
82-
metacp,
8380
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
8481
"org.scala-lang" % "scala-reflect" % scalaVersion.value
8582
)
@@ -243,7 +240,7 @@ lazy val docs = project
243240
crossScalaVersions := List(scala212),
244241
libraryDependencies ++= List(
245242
"com.geirsson" %% "metaconfig-docs" % metaconfigV,
246-
"org.scalameta" % "interactive" % scalametaV cross CrossVersion.full
243+
"org.scalameta" % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
247244
)
248245
)
249246
.dependsOn(testkit, core, cli)

project/Dependencies.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt._
22
/* scalafmt: { maxColumn = 120 }*/
33

44
object Dependencies {
5-
val scalametaV = "4.1.5"
5+
val scalametaV = "4.1.9"
66
val metaconfigV = "0.9.1"
77
def dotty = "0.9.0-RC1"
88
def scala210 = "2.10.6"
@@ -19,9 +19,7 @@ object Dependencies {
1919

2020
def metacp = "org.scalameta" %% "metacp" % scalametaV
2121
def semanticdbPluginLibrary = "org.scalameta" % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
22-
def scalameta = "org.scalameta" %% "contrib" % scalametaV
23-
def symtab = "org.scalameta" %% "symtab" % scalametaV
24-
def metap = "org.scalameta" %% "metap" % scalametaV
22+
def scalameta = "org.scalameta" %% "scalameta" % scalametaV
2523
def scalatest = "org.scalatest" %% "scalatest" % "3.2.0-SNAP10"
2624
def scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
2725

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
1111
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.22")
1212
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
1313
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
14-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.8")
14+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.10")

scalafix-tests/unit/src/main/resources/expect/Pretty.expect

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[6:7..6:17]: test/PrettyTest# => class PrettyTest extends AnyRef { +4 decls }
22
[6:18..6:18]: test/PrettyTest#`<init>`(). => primary ctor <init>()
3-
[7:3..7:21]: *(canBuildFrom[Int])
3+
[7:3..7:21]: *(List.canBuildFrom[Int])
44
[7:3..7:14]: *[Int,List[Int]]
55
[7:3..7:7]: *.apply[Int]
66
[8:3..12:12]: orig(1.to(10)).flatMap[Int,IndexedSeq[Int]](
77
{ (i) =>
88
orig(2.to(20)).withFilter(
99
{ (j) => orig(i > i) }
1010
).map[Int,IndexedSeq[Int]]({ (j) => orig(j) })(
11-
canBuildFrom[Int]
11+
IndexedSeq.canBuildFrom[Int]
1212
)
1313
}
14-
)(canBuildFrom[Int])
14+
)(IndexedSeq.canBuildFrom[Int])
1515
[9:10..9:11]: intWrapper(*)
1616
[10:10..10:11]: intWrapper(*)
1717
[13:3..17:15]: orig(Future(1.to(10)))(global).foreach[Unit](

scalafix-tests/unit/src/test/scala/scalafix/tests/v0/LegacySyntheticsSuite.scala

+12-9
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
1010
val obtained = synthetics.sortBy(_.position.start).mkString("\n")
1111
val expected =
1212
"""
13-
|[221..226): *(canBuildFrom[Int])
13+
|[221..226): *(List.canBuildFrom[Int])
1414
| [0..1): * => _star_.
15-
| [2..14): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
16-
| [15..18): Int => scala/Int#
15+
| [2..6): List => scala/collection/immutable/List.
16+
| [7..19): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
17+
| [20..23): Int => scala/Int#
1718
|[221..226): *[List]
1819
| [0..1): * => _star_.
1920
| [2..6): List => scala/package.List#
@@ -22,10 +23,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
2223
| [2..5): Int => scala/Int#
2324
| [7..10): Set => scala/Predef.Set#
2425
| [11..14): Int => scala/Int#
25-
|[245..253): *(canBuildFrom[Int])
26+
|[245..253): *(Set.canBuildFrom[Int])
2627
| [0..1): * => _star_.
27-
| [2..14): canBuildFrom => scala/collection/immutable/Set.canBuildFrom().
28-
| [15..18): Int => scala/Int#
28+
| [2..5): Set => scala/collection/immutable/Set.
29+
| [6..18): canBuildFrom => scala/collection/immutable/Set.canBuildFrom().
30+
| [19..22): Int => scala/Int#
2931
|[245..253): *[List[Int], Int, Set[Int]]
3032
| [0..1): * => _star_.
3133
| [2..6): List => scala/collection/immutable/List#
@@ -49,10 +51,11 @@ class LegacySyntheticsSuite extends BaseSemanticSuite("LegacySyntheticsTest") {
4951
| [0..1): * => _star_.
5052
| [2..7): apply => scala/concurrent/Future.apply().
5153
| [8..11): Int => scala/Int#
52-
|[301..309): *(canBuildFrom[Int])
54+
|[301..309): *(List.canBuildFrom[Int])
5355
| [0..1): * => _star_.
54-
| [2..14): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
55-
| [15..18): Int => scala/Int#
56+
| [2..6): List => scala/collection/immutable/List.
57+
| [7..19): canBuildFrom => scala/collection/immutable/List.canBuildFrom().
58+
| [20..23): Int => scala/Int#
5659
|[301..309): *[List[Future[Int]], Int, List[Int]]
5760
| [0..1): * => _star_.
5861
| [2..6): List => scala/collection/immutable/List#

0 commit comments

Comments
 (0)