From 38fdb3ec89cb02d9992b4b60f9adf5995bb11cbf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 11 Jul 2024 02:30:48 +0000 Subject: [PATCH 1/4] Update trees_2.13 to 4.9.8 --- project/deps.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/deps.sc b/project/deps.sc index 09c0eef658..bf4648dabf 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -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 From 81cac4acb034df5f6cbfdba7d704ee3a68519328 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 11 Jul 2024 10:56:33 +0200 Subject: [PATCH 2/4] Add the missing `org.scalameta:semanticdb-shared` dependency --- build.sc | 1 + project/deps.sc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build.sc b/build.sc index 31f86da748..4c5633dfd1 100644 --- a/build.sc +++ b/build.sc @@ -679,6 +679,7 @@ trait Build extends ScalaCliCrossSbtModule Deps.javaClassName, Deps.jsoniterCore, Deps.scalametaTrees, + Deps.scalametaSemanticDbShared, Deps.nativeTestRunner, Deps.osLib, Deps.pprint, diff --git a/project/deps.sc b/project/deps.sc index bf4648dabf..5b36038aaf 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -184,6 +184,8 @@ object Deps { def scalametaTrees = ivy"org.scalameta:trees_2.13:${Versions.scalaMeta}" .exclude(("com.lihaoyi", "sourcecode_2.13")) .exclude(("org.scala-lang.modules", "scala-collection-compat_2.13")) + def scalametaSemanticDbShared = + ivy"org.scalameta:semanticdb-shared_${Scala.scala213}:${Versions.scalaMeta}" 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" From c8341b410373e2c6c183a788865fdbadcae8890c Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 11 Jul 2024 11:23:27 +0200 Subject: [PATCH 3/4] Remove the no longer necessary `org.scalameta:trees` dependency --- build.sc | 8 ++++---- project/deps.sc | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.sc b/build.sc index 4c5633dfd1..ecd04983eb 100644 --- a/build.sc +++ b/build.sc @@ -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}" @@ -678,7 +679,6 @@ trait Build extends ScalaCliCrossSbtModule Deps.collectionCompat, Deps.javaClassName, Deps.jsoniterCore, - Deps.scalametaTrees, Deps.scalametaSemanticDbShared, Deps.nativeTestRunner, Deps.osLib, diff --git a/project/deps.sc b/project/deps.sc index 5b36038aaf..90ee8a053f 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -180,18 +180,14 @@ 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}" - .exclude(("com.lihaoyi", "sourcecode_2.13")) - .exclude(("org.scala-lang.modules", "scala-collection-compat_2.13")) - def scalametaSemanticDbShared = - ivy"org.scalameta:semanticdb-shared_${Scala.scala213}:${Versions.scalaMeta}" - 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}" def signingCliShared = ivy"org.virtuslab.scala-cli-signing::shared:${Versions.signingCli}" // to prevent collisions with scala-cli's case-app version From f8b7f200fd8813a80f830c7eba33644e4b86833b Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 11 Jul 2024 14:16:40 +0200 Subject: [PATCH 4/4] Exclude `jline` from `semanticdb-shared` --- project/deps.sc | 1 + 1 file changed, 1 insertion(+) diff --git a/project/deps.sc b/project/deps.sc index 90ee8a053f..cb18fd6afd 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -188,6 +188,7 @@ object Deps { 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