Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
/sbtPublic
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Add support for custom protocol with coursier#6375

Open
MasseGuillaume wants to merge1 commit intosbt:develop
base:develop
Choose a base branch
Loading
fromMasseGuillaume:coursier-custom-protocol
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletionsmain/src/main/scala/sbt/Defaults.scala
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ object Defaults extends BuildCommon {
csrLogger := LMCoursier.coursierLoggerTask.value,
csrMavenProfiles :== Set.empty,
csrReconciliations :== LMCoursier.relaxedForAllModules,
csrProtocolHandlerDependencies :== Nil,
)

/** Core non-plugin settings for sbt builds. These *must* be on every build or the sbt engine will fail to run at all. */
Expand Down
1 change: 1 addition & 0 deletionsmain/src/main/scala/sbt/Keys.scala
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -445,6 +445,7 @@ object Keys {
val csrExtraCredentials = taskKey[Seq[lmcoursier.credentials.Credentials]]("")
val csrPublications = taskKey[Seq[(lmcoursier.definitions.Configuration, lmcoursier.definitions.Publication)]]("")
val csrReconciliations = settingKey[Seq[(ModuleMatchers, Reconciliation)]]("Strategy to reconcile version conflicts.")
val csrProtocolHandlerDependencies = settingKey[Seq[ModuleID]]("Dependency to fetch to be able to load custom protocols.")

val internalConfigurationMap = settingKey[Configuration => Configuration]("Maps configurations to the actual configuration used to define the classpath.").withRank(CSetting)
val classpathConfiguration = taskKey[Configuration]("The configuration used to define the classpath.").withRank(CTask)
Expand Down
22 changes: 15 additions & 7 deletionsmain/src/main/scala/sbt/coursierint/LMCoursier.scala
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,8 @@ object LMCoursier {
ivyHome: Option[File],
strict: Option[CStrict],
depsOverrides: Seq[ModuleID],
log: Logger
log: Logger,
protocolHandlerDependencies: Seq[ModuleID]
): CoursierConfiguration =
coursierConfiguration(
rs,
Expand All@@ -117,7 +118,8 @@ object LMCoursier {
strict,
depsOverrides,
None,
log
log,
protocolHandlerDependencies
)

def coursierConfiguration(
Expand All@@ -142,7 +144,8 @@ object LMCoursier {
strict: Option[CStrict],
depsOverrides: Seq[ModuleID],
updateConfig: Option[UpdateConfiguration],
log: Logger
log: Logger,
protocolHandlerDependencies: Seq[ModuleID],
): CoursierConfiguration = {
val coursierExcludeDeps = Inputs
.exclusions(
Expand DownExpand Up@@ -195,6 +198,7 @@ object LMCoursier {
.withStrict(strict)
.withForceVersions(userForceVersions.toVector)
.withMissingOk(missingOk)
.withProtocolHandlerDependencies(protocolHandlerDependencies)
}

def coursierConfigurationTask: Def.Initialize[Task[CoursierConfiguration]] = Def.task {
Expand All@@ -221,7 +225,8 @@ object LMCoursier {
CoursierInputsTasks.strictTask.value,
dependencyOverrides.value,
Some(updateConfiguration.value),
streams.value.log
streams.value.log,
csrProtocolHandlerDependencies.value,
)
}

Expand DownExpand Up@@ -249,7 +254,8 @@ object LMCoursier {
CoursierInputsTasks.strictTask.value,
dependencyOverrides.value,
Some(updateConfiguration.value),
streams.value.log
streams.value.log,
csrProtocolHandlerDependencies.value
)
}

Expand DownExpand Up@@ -277,7 +283,8 @@ object LMCoursier {
CoursierInputsTasks.strictTask.value,
dependencyOverrides.value,
Some(updateConfiguration.value),
streams.value.log
streams.value.log,
csrProtocolHandlerDependencies.value,
)
}

Expand DownExpand Up@@ -305,7 +312,8 @@ object LMCoursier {
CoursierInputsTasks.strictTask.value,
dependencyOverrides.value,
Some(updateConfiguration.value),
streams.value.log
streams.value.log,
csrProtocolHandlerDependencies.value,
)
}

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp