Skip to content

Commit 4005462

Browse files
authored
update scalameta version (#244)
1 parent 3a645b3 commit 4005462

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inThisBuild(
55
List(
66
scalaVersion := V.scala213,
77
semanticdbEnabled := true,
8-
semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
8+
semanticdbVersion := V.scalameta,
99
scalafixScalaBinaryVersion := V.scala213BinaryVersion,
1010
scalafixDependencies ++= List("com.github.liancheng" %% "organize-imports" % V.organizeImports),
1111
organization := "ch.epfl.scala",
@@ -110,7 +110,7 @@ lazy val `sbt-plugin` = project
110110
name,
111111
"scala3Version" -> V.scala3,
112112
"scalaBinaryVersion" -> V.scala213BinaryVersion,
113-
"semanticdbVersion" -> V.semanticdbVersion,
113+
"scalametaVersion" -> V.scalameta,
114114
version
115115
)
116116
)
@@ -216,7 +216,7 @@ lazy val V = new {
216216
val kindProjector = "0.13.0"
217217
val coursierApi = "2.0.16"
218218
val coursierInterface = "1.0.4"
219-
val semanticdbVersion = "4.4.10"
219+
val scalameta = "4.4.21"
220220
val localSnapshotVersion = "0.4.0-SNAPSHOT"
221221
val zio = "1.0.8"
222222
}

plugin/src/main/scala/migrate/ScalaMigratePlugin.scala

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ case class Scala2Inputs(
3333
)
3434

3535
object ScalaMigratePlugin extends AutoPlugin {
36-
private[migrate] val syntheticsOn = "-P:semanticdb:synthetics:on"
37-
private[migrate] val migrationOn = "-source:3.0-migration"
38-
private[migrate] val scalaBinaryVersion = BuildInfo.scalaBinaryVersion
39-
private[migrate] val migrateVersion = BuildInfo.version
40-
private[migrate] val scala3Version = BuildInfo.scala3Version
41-
private[migrate] val migrateSemanticdbVersion = BuildInfo.semanticdbVersion
42-
private[migrate] val migrateAPI = Migrate.fetchAndClassloadInstance(migrateVersion, scalaBinaryVersion)
36+
private[migrate] val syntheticsOn = "-P:semanticdb:synthetics:on"
37+
private[migrate] val migrationOn = "-source:3.0-migration"
38+
private[migrate] val scalaBinaryVersion = BuildInfo.scalaBinaryVersion
39+
private[migrate] val migrateVersion = BuildInfo.version
40+
private[migrate] val scala3Version = BuildInfo.scala3Version
41+
private[migrate] val migrateScalametaVersion = BuildInfo.scalametaVersion
42+
private[migrate] val migrateAPI = Migrate.fetchAndClassloadInstance(migrateVersion, scalaBinaryVersion)
4343

4444
private[migrate] val inputsStore: mutable.Map[Scope, Scala2Inputs] = mutable.Map()
4545

@@ -72,8 +72,10 @@ object ScalaMigratePlugin extends AutoPlugin {
7272
},
7373
semanticdbVersion := {
7474
val sv = scalaVersion.value
75-
if (sv.startsWith("2.13.")) migrateSemanticdbVersion
76-
else semanticdbVersion.value
75+
if (sv.startsWith("2.13.")) {
76+
val actual = semanticdbVersion.value
77+
if (actual > migrateScalametaVersion) actual else migrateScalametaVersion
78+
} else semanticdbVersion.value
7779
},
7880
migrationConfigs := migrationConfigsImpl.value,
7981
migrationConfigs / aggregate := false,

0 commit comments

Comments
 (0)