diff --git a/build.sbt b/build.sbt index b0e9bedcf..815e1a480 100644 --- a/build.sbt +++ b/build.sbt @@ -46,7 +46,7 @@ ThisBuild / assemblyMergeStrategy := { val coursierVersion0 = "2.1.9" val lmVersion = "1.3.4" val lm2_13Version = "1.5.0-M3" -val lm3Version = "2.0.0-alpha15" +val lm3Version = "2.0.0-M1" lazy val scalafixGen = Def.taskDyn { val root = (ThisBuild / baseDirectory).value.toURI.toString diff --git a/modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala b/modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala index 8bd239b89..6b93880db 100644 --- a/modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala +++ b/modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala @@ -4,7 +4,7 @@ import java.net.URL import dataclass.data import lmcoursier.definitions.Module - +//FIXME use URI instead of URL @data class FallbackDependency( module: Module, version: String, diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala b/modules/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala index 4b9349484..381bb29f9 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala @@ -143,7 +143,7 @@ object FromSbt { url <- artifact.url.toSeq } yield { val (module0, version) = moduleVersion(module, scalaVersion, scalaBinaryVersion) - FallbackDependency(module0, version, url, module.isChanging) + FallbackDependency(module0, version, url.toURL, module.isChanging) } def project( diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala index 55bf9fc4a..15a22ba92 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala @@ -70,7 +70,7 @@ private[internal] object SbtUpdateReport { .orElse(MavenAttributes.typeDefaultClassifierOpt(pub.`type`)) .map(_.value) ) - .withUrl(Some(CacheUrl.url(artifact.url, classLoaders))) + .withUrl(Some(CacheUrl.url(artifact.url, classLoaders).toURI)) .withExtraAttributes(module.attributes ++ extraProperties) }