From bbb96bf7fd2243d46c40902e62da2f08a6088475 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Sun, 2 Nov 2025 18:49:25 +0100 Subject: [PATCH] build unpublished core3 & reflect3 against scalameta 3 counterparts --- build.sbt | 12 +++++++----- project/Dependencies.scala | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index f72109174..df4cbdcca 100644 --- a/build.sbt +++ b/build.sbt @@ -77,7 +77,7 @@ lazy val core = projectMatrix libraryDependencies ++= Seq( googleDiff, metaconfig, - scalametaFor3Use2_13, + scalameta, semanticdbSharedFor3Use2_13, collectionCompat ) @@ -98,10 +98,12 @@ lazy val core3 = project googleDiff, metaconfig ) ++ Seq( - scalametaFor3Use2_13, + scalameta, semanticdbSharedFor3Use2_13 ).map { mod => mod + .exclude("org.scalameta", "scalameta_2.13") + .exclude("org.scalameta", "parsers_2.13") .exclude("com.lihaoyi", "sourcecode_2.13") .exclude("org.scala-lang.modules", "scala-collection-compat_2.13") } @@ -298,10 +300,10 @@ lazy val unit = projectMatrix ), libraryDependencies += { if (!isScala3.value) { - scalametaTeskitFor3Use2_13 + scalametaTeskit } else { // exclude _2.13 artifacts that have their _3 counterpart in the classpath - scalametaTeskitFor3Use2_13 + (scalametaTeskit cross CrossVersion.for3Use2_13) .exclude("org.scalameta", "munit_2.13") } }, @@ -459,7 +461,7 @@ lazy val docs = projectMatrix Dependencies.runtimeDepsForBackwardCompatibility .map(_.withRevision(VersionScheme.Always)), // force eviction of mdoc transitive dependency - dependencyOverrides += scalametaFor3Use2_13 + dependencyOverrides += scalameta ) .defaultAxes(VirtualAxis.jvm) .jvmPlatform(scalaVersions = Seq(scala213)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 11498e8d2..f3f3e79b8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -41,8 +41,8 @@ object Dependencies { val metacp = "org.scalameta" %% "metacp" % scalametaV val nailgunServer = "com.martiansoftware" % "nailgun-server" % nailgunV val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlV - val scalametaFor3Use2_13 = "org.scalameta" %% "scalameta" % scalametaV cross CrossVersion.for3Use2_13 - val scalametaTeskitFor3Use2_13 = "org.scalameta" %% "testkit" % scalametaV cross CrossVersion.for3Use2_13 + val scalameta = "org.scalameta" %% "scalameta" % scalametaV + val scalametaTeskit = "org.scalameta" %% "testkit" % scalametaV val scalatags = "com.lihaoyi" %% "scalatags" % scalatagsV val scalatest = "org.scalatest" %% "scalatest" % scalatestV val munit = "org.scalameta" %% "munit" % munitV