mirror of https://github.com/sbt/sbt.git
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:
commit
eac1e53899
|
|
@ -23,6 +23,7 @@ lazy val `lm-coursier` = project
|
||||||
.settings(
|
.settings(
|
||||||
shared,
|
shared,
|
||||||
Mima.settings,
|
Mima.settings,
|
||||||
|
Mima.lmCoursierFilters,
|
||||||
libraryDependencies ++= Seq(
|
libraryDependencies ++= Seq(
|
||||||
"io.get-coursier" %% "coursier" % coursierVersion0,
|
"io.get-coursier" %% "coursier" % coursierVersion0,
|
||||||
// We depend on librarymanagement-ivy rather than just
|
// We depend on librarymanagement-ivy rather than just
|
||||||
|
|
@ -41,6 +42,8 @@ lazy val `lm-coursier-shaded` = project
|
||||||
.settings(
|
.settings(
|
||||||
shared,
|
shared,
|
||||||
Mima.settings,
|
Mima.settings,
|
||||||
|
Mima.lmCoursierFilters,
|
||||||
|
Mima.lmCoursierShadedFilters,
|
||||||
unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value,
|
unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value,
|
||||||
shading,
|
shading,
|
||||||
shadingNamespace := "lmcoursier.internal.shaded",
|
shadingNamespace := "lmcoursier.internal.shaded",
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,6 @@ package lmcoursier.credentials
|
||||||
|
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
|
|
||||||
import coursier.core.Authentication
|
|
||||||
|
|
||||||
final class DirectCredentials private(
|
final class DirectCredentials private(
|
||||||
val host: String,
|
val host: String,
|
||||||
val username: String,
|
val username: String,
|
||||||
|
|
@ -77,11 +75,6 @@ final class DirectCredentials private(
|
||||||
user == username
|
user == username
|
||||||
}
|
}
|
||||||
|
|
||||||
def authentication: Authentication =
|
|
||||||
Authentication(username, password)
|
|
||||||
.withRealm(realm)
|
|
||||||
.withOptional(optional)
|
|
||||||
|
|
||||||
def get(): Seq[DirectCredentials] =
|
def get(): Seq[DirectCredentials] =
|
||||||
Seq(this)
|
Seq(this)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
|
|
||||||
import com.typesafe.tools.mima.plugin.MimaPlugin
|
import com.typesafe.tools.mima.plugin.MimaPlugin
|
||||||
|
import com.typesafe.tools.mima.plugin.MimaKeys._
|
||||||
import sbt._
|
import sbt._
|
||||||
import sbt.Keys._
|
import sbt.Keys._
|
||||||
import sys.process._
|
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."))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-4")
|
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC2")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue