diff --git a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala index 75e481db9..83c5f52a6 100644 --- a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala +++ b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala @@ -7,7 +7,6 @@ import coursier.{ Organization, Resolution } import coursier.core.{ Classifier, Configuration, Dependency, VariantPublication, Publication } import coursier.cache.CacheDefaults import coursier.util.Artifact -import coursier.internal.Typelevel import lmcoursier.definitions.ToCoursier import lmcoursier.internal.{ ArtifactsParams, @@ -151,10 +150,11 @@ class CoursierDependencyResolution( sys.error(s"unrecognized ModuleDescriptor type: $module") } - val so = conf.scalaOrganization + val soOpt = conf.scalaOrganization .map(Organization(_)) .orElse(module0.scalaModuleInfo.map(m => Organization(m.scalaOrganization))) - .getOrElse(Organization("org.scala-lang")) + + val so = soOpt.getOrElse(Organization("org.scala-lang")) val sv = conf.scalaVersion .orElse(module0.scalaModuleInfo.map(_.scalaFullVersion)) // FIXME Manage to do stuff below without a scala version? @@ -263,8 +263,6 @@ class CoursierDependencyResolution( (ToCoursier.configuration(config), extends0.map(ToCoursier.configuration)) } - val typelevel = so == Typelevel.typelevelOrg - val cache0 = coursier.cache .FileCache() .withLocation(cache) @@ -303,7 +301,7 @@ class CoursierDependencyResolution( (ToCoursier.module(k), ToCoursier.versionConstraint(v)) .toMap ) - .withTypelevel(typelevel) + .withScalaOrganizationOverride(soOpt) .withReconciliation0(conf.reconciliation.map: (k, v) => ToCoursier.moduleMatchers(k) -> ToCoursier.constraintReconciliation(v)) .withExclusions(excludeDependencies) diff --git a/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt new file mode 100644 index 000000000..e0777f7ad --- /dev/null +++ b/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt @@ -0,0 +1,11 @@ +@transient +lazy val check = taskKey[Unit]("check") + +scalaVersion := "3.8.3-RC1-bin-20260218-bb6fc60-NIGHTLY" +scalaOrganization := "ch.epfl.lara" +libraryDependencies += "com.lihaoyi" %% "fansi" % "0.5.0" +check := { + val cp = (Compile / fullClasspath).value.map(_.data) + cp.foreach: x => + assert(!x.toString.contains("org/scala-lang"), s"$x contains org/scala-lang") +} diff --git a/sbt-app/src/sbt-test/dependency-management/scala-organization/test b/sbt-app/src/sbt-test/dependency-management/scala-organization/test new file mode 100644 index 000000000..15675b169 --- /dev/null +++ b/sbt-app/src/sbt-test/dependency-management/scala-organization/test @@ -0,0 +1 @@ +> check