Skip to content

Commit d3af5b5

Browse files
Swap scalameta trees for semanticdb-shared & bump scalameta to 4.9.8 (#3017)
* Update trees_2.13 to 4.9.8 * Add the missing `org.scalameta:semanticdb-shared` dependency * Remove the no longer necessary `org.scalameta:trees` dependency * Exclude `jline` from `semanticdb-shared` --------- Co-authored-by: Scala Steward <[email protected]>
1 parent 2ca1704 commit d3af5b5

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

build.sc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,10 @@ trait Core extends ScalaCliCrossSbtModule
422422
| def runnerVersion = "${runner(Scala.runnerScala3).publishVersion()}"
423423
| def runnerMainClass = "$runnerMainClass"
424424
|
425-
| def semanticDbPluginOrganization = "${Deps.scalametaTrees.dep.module.organization.value}"
426-
| def semanticDbPluginModuleName = "semanticdb-scalac"
427-
| def semanticDbPluginVersion = "${Deps.scalametaTrees.dep.version}"
425+
| def semanticDbPluginOrganization = "${Deps.semanticDbScalac.dep.module.organization
426+
.value}"
427+
| def semanticDbPluginModuleName = "${Deps.semanticDbScalac.dep.module.name.value}"
428+
| def semanticDbPluginVersion = "${Deps.semanticDbScalac.dep.version}"
428429
|
429430
| def semanticDbJavacPluginOrganization = "${Deps.semanticDbJavac.dep.module.organization
430431
.value}"
@@ -678,7 +679,7 @@ trait Build extends ScalaCliCrossSbtModule
678679
Deps.collectionCompat,
679680
Deps.javaClassName,
680681
Deps.jsoniterCore,
681-
Deps.scalametaTrees,
682+
Deps.scalametaSemanticDbShared,
682683
Deps.nativeTestRunner,
683684
Deps.osLib,
684685
Deps.pprint,

project/deps.sc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ object Deps {
9797
def coursierM1Cli = coursierDefault
9898
def jsoniterScala = "2.23.2"
9999
def jsoniterScalaJava8 = "2.13.5.2"
100-
def scalaMeta = "4.9.7"
100+
def scalaMeta = "4.9.8"
101101
def scalaNative04 = "0.4.17"
102102
def scalaNative05 = "0.5.4"
103103
def scalaNative = scalaNative05
@@ -180,16 +180,15 @@ object Deps {
180180
def scalaJsLogging = ivy"org.scala-js:scalajs-logging_2.13:1.1.1"
181181
// Force using of 2.13 - is there a better way?
182182
def scalaJsTestAdapter = ivy"org.scala-js:scalajs-sbt-test-adapter_2.13:${Scala.scalaJs}"
183-
// Force using of 2.13 - is there a better way?
184-
def scalametaTrees = ivy"org.scalameta:trees_2.13:${Versions.scalaMeta}"
185-
.exclude(("com.lihaoyi", "sourcecode_2.13"))
186-
.exclude(("org.scala-lang.modules", "scala-collection-compat_2.13"))
187-
def scalaPackager = ivy"org.virtuslab:scala-packager_2.13:${Versions.scalaPackager}"
188-
def scalaPackagerCli = ivy"org.virtuslab:scala-packager-cli_2.13:${Versions.scalaPackager}"
189-
def scalaPy = ivy"dev.scalapy::scalapy-core::0.5.3"
183+
def scalaPackager = ivy"org.virtuslab:scala-packager_2.13:${Versions.scalaPackager}"
184+
def scalaPackagerCli = ivy"org.virtuslab:scala-packager-cli_2.13:${Versions.scalaPackager}"
185+
def scalaPy = ivy"dev.scalapy::scalapy-core::0.5.3"
190186
def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
191187
def semanticDbJavac = ivy"com.sourcegraph:semanticdb-javac:${Versions.javaSemanticdb}"
192188
def semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:${Versions.scalaMeta}"
189+
def scalametaSemanticDbShared =
190+
ivy"org.scalameta:semanticdb-shared_${Scala.scala213}:${Versions.scalaMeta}"
191+
.exclude("org.jline" -> "jline") // to prevent incompatibilities with GraalVM <23
193192
def signingCliShared =
194193
ivy"org.virtuslab.scala-cli-signing::shared:${Versions.signingCli}"
195194
// to prevent collisions with scala-cli's case-app version

0 commit comments

Comments
 (0)