Merge pull request #243 from alexarchambault/develop

Minor tweaking
This commit is contained in:
Alexandre Archambault 2020-05-29 19:44:42 +02:00 committed by GitHub
commit 677725dc3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions

View File

@ -15,6 +15,8 @@ import dataclass.data
object ModuleMatchers {
def all: ModuleMatchers =
ModuleMatchers(Set.empty, Set.empty)
def only(organization: String, moduleName: String): ModuleMatchers =
ModuleMatchers(Set.empty, Set(Module(Organization(organization), ModuleName(moduleName), Map())), includeByDefault = false)
def only(mod: Module): ModuleMatchers =
ModuleMatchers(Set.empty, Set(mod), includeByDefault = false)
}

View File

@ -62,6 +62,7 @@ object LmCoursierPlugin extends AutoPlugin {
Def.task(sbt.hack.Foo.updateTask(lm).value)
}.value
) ++
setCsrConfiguration ++
inTask(updateClassifiers)(
Seq(
dependencyResolution := mkDependencyResolution.value,
@ -86,6 +87,21 @@ object LmCoursierPlugin extends AutoPlugin {
}
}
private def setCsrConfiguration: Seq[Setting[_]] = {
val csrConfigurationOpt = try {
val key = sbt.Keys.asInstanceOf[{
def csrConfiguration: TaskKey[CoursierConfiguration]
}].csrConfiguration
Some(key)
} catch {
case _: NoSuchMethodException =>
None
}
csrConfigurationOpt.toSeq.map { csrConfiguration =>
csrConfiguration := coursierConfiguration.value
}
}
private def mkCoursierConfiguration(withClassifiers: Boolean = false, sbtClassifiers: Boolean = false): Def.Initialize[Task[CoursierConfiguration]] =
Def.taskDyn {