From 5ea339c6f3686ec4c7cccdb10139371d9c2e1b69 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 6 Mar 2019 10:24:14 +0100
Subject: [PATCH] Only add cross version suffixes when necessary

From CoursierDependencyResolution
---
 .../CoursierDependencyResolution.scala        |  6 ++--
 .../scala/coursier/lmcoursier/FromSbt.scala   | 30 ++++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala
index 2930f9945..0f771d70b 100644
--- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala
+++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala
@@ -108,9 +108,9 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
     val dependencies = module0
       .dependencies
       .flatMap { d =>
-        // crossVersion already taken into account, wiping it here
-        val d0 = d.withCrossVersion(CrossVersion.Disabled())
-        FromSbt.dependencies(d0, sv, sbv)
+        // crossVersion sometimes already taken into account (when called via the update task), sometimes not
+        // (e.g. sbt-dotty 0.13.0-RC1)
+        FromSbt.dependencies(d, sv, sbv, optionalCrossVer = true)
       }
       .map {
         case (config, dep) =>
diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala
index d9ea873cb..25b15b3e7 100644
--- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala
+++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala
@@ -2,7 +2,7 @@ package coursier.lmcoursier
 
 import coursier.ivy.IvyRepository
 import coursier.ivy.IvyXml.{mappings => ivyXmlMappings}
-import java.net.{MalformedURLException, URL}
+import java.net.MalformedURLException
 
 import coursier.cache.CacheUrl
 import coursier.{Attributes, Dependency, Module}
@@ -17,9 +17,21 @@ object FromSbt {
   def sbtModuleIdName(
     moduleId: ModuleID,
     scalaVersion: => String,
-    scalaBinaryVersion: => String
-  ): String =
-    sbtCrossVersionName(moduleId.name, moduleId.crossVersion, scalaVersion, scalaBinaryVersion)
+    scalaBinaryVersion: => String,
+    optionalCrossVer: Boolean = false
+  ): String = {
+    val name0 = moduleId.name
+    val updatedName = sbtCrossVersionName(name0, moduleId.crossVersion, scalaVersion, scalaBinaryVersion)
+    if (!optionalCrossVer || updatedName.length <= name0.length)
+      updatedName
+    else {
+      val suffix = updatedName.substring(name0.length)
+      if (name0.endsWith(suffix))
+        name0
+      else
+        updatedName
+    }
+  }
 
   def sbtCrossVersionName(
     name: String,
@@ -40,10 +52,11 @@ object FromSbt {
   def moduleVersion(
     module: ModuleID,
     scalaVersion: String,
-    scalaBinaryVersion: String
+    scalaBinaryVersion: String,
+    optionalCrossVer: Boolean = false
   ): (Module, String) = {
 
-    val fullName = sbtModuleIdName(module, scalaVersion, scalaBinaryVersion)
+    val fullName = sbtModuleIdName(module, scalaVersion, scalaBinaryVersion, optionalCrossVer)
 
     val module0 = Module(Organization(module.organization), ModuleName(fullName), FromSbt.attributes(module.extraDependencyAttributes))
     val version = module.revision
@@ -54,12 +67,13 @@ object FromSbt {
   def dependencies(
     module: ModuleID,
     scalaVersion: String,
-    scalaBinaryVersion: String
+    scalaBinaryVersion: String,
+    optionalCrossVer: Boolean = false
   ): Seq[(Configuration, Dependency)] = {
 
     // TODO Warn about unsupported properties in `module`
 
-    val (module0, version) = moduleVersion(module, scalaVersion, scalaBinaryVersion)
+    val (module0, version) = moduleVersion(module, scalaVersion, scalaBinaryVersion, optionalCrossVer)
 
     val dep = Dependency(
       module0,