Merge pull request #96 from alexarchambault/sbt-coursier-2.0.0-RC2

Switch to sbt-coursier 2.0.0-RC2
This commit is contained in:
Alexandre Archambault 2019-07-02 14:44:12 +02:00 committed by GitHub
commit eac1e53899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 8 deletions

View File

@ -23,6 +23,7 @@ lazy val `lm-coursier` = project
.settings(
shared,
Mima.settings,
Mima.lmCoursierFilters,
libraryDependencies ++= Seq(
"io.get-coursier" %% "coursier" % coursierVersion0,
// We depend on librarymanagement-ivy rather than just
@ -41,6 +42,8 @@ lazy val `lm-coursier-shaded` = project
.settings(
shared,
Mima.settings,
Mima.lmCoursierFilters,
Mima.lmCoursierShadedFilters,
unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value,
shading,
shadingNamespace := "lmcoursier.internal.shaded",

View File

@ -2,8 +2,6 @@ package lmcoursier.credentials
import java.net.URI
import coursier.core.Authentication
final class DirectCredentials private(
val host: String,
val username: String,
@ -77,11 +75,6 @@ final class DirectCredentials private(
user == username
}
def authentication: Authentication =
Authentication(username, password)
.withRealm(realm)
.withOptional(optional)
def get(): Seq[DirectCredentials] =
Seq(this)

View File

@ -1,5 +1,6 @@
import com.typesafe.tools.mima.plugin.MimaPlugin
import com.typesafe.tools.mima.plugin.MimaKeys._
import sbt._
import sbt.Keys._
import sys.process._
@ -30,4 +31,28 @@ object Mima {
}
)
lazy val lmCoursierFilters = {
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
Seq(
// Removed unused method, shouldn't have been there in the first place
ProblemFilters.exclude[DirectMissingMethodProblem]("lmcoursier.credentials.DirectCredentials.authentication")
)
}
}
lazy val lmCoursierShadedFilters = {
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
Seq(
// Should have been put under lmcoursier.internal?
(pb: Problem) => pb.matchName.forall(!_.startsWith("lmcoursier.definitions.ToCoursier.")),
// ignore shaded and internal stuff related errors
(pb: Problem) => pb.matchName.forall(!_.startsWith("lmcoursier.internal."))
)
}
}
}

View File

@ -1 +1 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-4")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC2")