Scala 2.13 support (#307)

This commit is contained in:
eugene yokota 2021-01-10 16:02:04 -05:00 committed by GitHub
parent 81de29c78d
commit 07278af003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 7 deletions

View File

@ -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
)
)

View File

@ -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

View File

@ -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"

View File

@ -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"
}