Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swap scalameta trees for semanticdb-shared & bump scalameta to 4.9.8 #3017

Merged
merged 4 commits into from
Jul 11, 2024
Merged

Swap scalameta trees for semanticdb-shared & bump scalameta to 4.9.8 #3017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38fdb3e
Update trees_2.13 to 4.9.8
scala-steward Jul 11, 2024
81cac4a
Add the missing `org.scalameta:semanticdb-shared` dependency
Gedochao Jul 11, 2024
c8341b4
Remove the no longer necessary `org.scalameta:trees` dependency
Gedochao Jul 11, 2024
f8b7f20
Exclude `jline` from `semanticdb-shared`
Gedochao Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,10 @@ trait Core extends ScalaCliCrossSbtModule
| def runnerVersion = "${runner(Scala.runnerScala3).publishVersion()}"
| def runnerMainClass = "$runnerMainClass"
|
| def semanticDbPluginOrganization = "${Deps.scalametaTrees.dep.module.organization.value}"
| def semanticDbPluginModuleName = "semanticdb-scalac"
| def semanticDbPluginVersion = "${Deps.scalametaTrees.dep.version}"
| def semanticDbPluginOrganization = "${Deps.semanticDbScalac.dep.module.organization
.value}"
| def semanticDbPluginModuleName = "${Deps.semanticDbScalac.dep.module.name.value}"
| def semanticDbPluginVersion = "${Deps.semanticDbScalac.dep.version}"
|
| def semanticDbJavacPluginOrganization = "${Deps.semanticDbJavac.dep.module.organization
.value}"
Expand Down Expand Up @@ -678,7 +679,7 @@ trait Build extends ScalaCliCrossSbtModule
Deps.collectionCompat,
Deps.javaClassName,
Deps.jsoniterCore,
Deps.scalametaTrees,
Deps.scalametaSemanticDbShared,
Deps.nativeTestRunner,
Deps.osLib,
Deps.pprint,
Expand Down
15 changes: 7 additions & 8 deletions project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ object Deps {
def coursierM1Cli = coursierDefault
def jsoniterScala = "2.23.2"
def jsoniterScalaJava8 = "2.13.5.2"
def scalaMeta = "4.9.7"
def scalaMeta = "4.9.8"
def scalaNative04 = "0.4.17"
def scalaNative05 = "0.5.4"
def scalaNative = scalaNative05
Expand Down Expand Up @@ -180,16 +180,15 @@ object Deps {
def scalaJsLogging = ivy"org.scala-js:scalajs-logging_2.13:1.1.1"
// Force using of 2.13 - is there a better way?
def scalaJsTestAdapter = ivy"org.scala-js:scalajs-sbt-test-adapter_2.13:${Scala.scalaJs}"
// Force using of 2.13 - is there a better way?
def scalametaTrees = ivy"org.scalameta:trees_2.13:${Versions.scalaMeta}"
Gedochao marked this conversation as resolved.
Show resolved Hide resolved
.exclude(("com.lihaoyi", "sourcecode_2.13"))
.exclude(("org.scala-lang.modules", "scala-collection-compat_2.13"))
def scalaPackager = ivy"org.virtuslab:scala-packager_2.13:${Versions.scalaPackager}"
def scalaPackagerCli = ivy"org.virtuslab:scala-packager-cli_2.13:${Versions.scalaPackager}"
def scalaPy = ivy"dev.scalapy::scalapy-core::0.5.3"
def scalaPackager = ivy"org.virtuslab:scala-packager_2.13:${Versions.scalaPackager}"
def scalaPackagerCli = ivy"org.virtuslab:scala-packager-cli_2.13:${Versions.scalaPackager}"
def scalaPy = ivy"dev.scalapy::scalapy-core::0.5.3"
def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
def semanticDbJavac = ivy"com.sourcegraph:semanticdb-javac:${Versions.javaSemanticdb}"
def semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:${Versions.scalaMeta}"
def scalametaSemanticDbShared =
ivy"org.scalameta:semanticdb-shared_${Scala.scala213}:${Versions.scalaMeta}"
.exclude("org.jline" -> "jline") // to prevent incompatibilities with GraalVM <23
def signingCliShared =
ivy"org.virtuslab.scala-cli-signing::shared:${Versions.signingCli}"
// to prevent collisions with scala-cli's case-app version
Expand Down
Loading