diff --git a/build.sbt b/build.sbt index 943f27ab1..f8a65f3d6 100644 --- a/build.sbt +++ b/build.sbt @@ -16,11 +16,14 @@ inThisBuild(List( )) val coursierVersion0 = "2.0.8" +val lmVersion = "1.3.4" +val lm2_13Version = "1.5.0-M3" lazy val `lm-coursier` = project .in(file("modules/lm-coursier")) .settings( shared, + crossScalaVersions := Seq(scala212, scala213), Mima.settings, Mima.lmCoursierFilters, libraryDependencies ++= Seq( @@ -31,7 +34,10 @@ lazy val `lm-coursier` = project // to DependencyResolutionInterface.update, which is an // IvySbt#Module (seems DependencyResolutionInterface.moduleDescriptor // is ignored). - "org.scala-sbt" %% "librarymanagement-ivy" % "1.3.4", + "org.scala-sbt" %% "librarymanagement-ivy" % { + if (scalaBinaryVersion.value == "2.12") lmVersion + else lm2_13Version + }, "org.scalatest" %% "scalatest" % "3.2.3" % Test ) ) @@ -41,6 +47,7 @@ lazy val `lm-coursier-shaded` = project .enablePlugins(ShadingPlugin) .settings( shared, + crossScalaVersions := Seq(scala212, scala213), Mima.settings, Mima.lmCoursierFilters, Mima.lmCoursierShadedFilters, @@ -65,7 +72,10 @@ lazy val `lm-coursier-shaded` = project "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, "org.scala-lang.modules" %% "scala-collection-compat" % "2.3.2", "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded - "org.scala-sbt" %% "librarymanagement-ivy" % "1.3.4", + "org.scala-sbt" %% "librarymanagement-ivy" % { + if (scalaBinaryVersion.value == "2.12") lmVersion + else lm2_13Version + }, "org.scalatest" %% "scalatest" % "3.2.3" % Test ) ) diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala index 13a51bc30..a4bde2eed 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala @@ -47,8 +47,8 @@ import scala.concurrent.duration.Duration @since verbosityLevel: Int = 0, ttl: Option[Duration] = CacheDefaults.ttl, - checksums: Vector[Option[String]] = CacheDefaults.checksums.to[Vector], - cachePolicies: Vector[CachePolicy] = CacheDefaults.cachePolicies.to[Vector].map(FromCoursier.cachePolicy), + checksums: Vector[Option[String]] = CacheDefaults.checksums.toVector, + cachePolicies: Vector[CachePolicy] = CacheDefaults.cachePolicies.toVector.map(FromCoursier.cachePolicy), @since missingOk: Boolean = false, @since diff --git a/project/Settings.scala b/project/Settings.scala index ed5096284..a0a1dd14a 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -11,7 +11,8 @@ import com.jsuereth.sbtpgp._ object Settings { - def scala212 = "2.12.10" + def scala212 = "2.12.12" + def scala213 = "2.13.3" def targetSbtVersion = "1.2.8" diff --git a/scripts/ci.sh b/scripts/ci.sh index 1f7825d6d..ce558a8ac 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -31,8 +31,8 @@ runLmCoursierTests() { ./metadata/scripts/with-test-repo.sh $SBT \ evictionCheck \ compatibilityCheck \ - lm-coursier-shaded/publishLocal \ - lm-coursier/test \ + +lm-coursier-shaded/publishLocal \ + +lm-coursier/test \ "sbt-lm-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA" }