Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: honor sbt resolvers in addition to scalafixResolvers #404

Merged
merged 24 commits into from
Apr 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
explicit type
GreyPlane committed Apr 17, 2024
commit 6b9c692b4b50b90ef91b74f25b79b8932775addb
52 changes: 26 additions & 26 deletions src/main/scala/scalafix/sbt/ScalafixPlugin.scala
Original file line number Diff line number Diff line change
@@ -2,16 +2,15 @@ package scalafix.sbt

import java.io.PrintStream
import java.nio.file.{Path, Paths}

import coursierapi.Repository
import sbt.KeyRanks.Invisible
import sbt.Keys._
import sbt._
import sbt.Keys.*
import sbt.{Def, *}
import sbt.internal.sbtscalafix.JLineAccess
import sbt.plugins.JvmPlugin
import scalafix.interfaces.{ScalafixError, ScalafixMainCallback}
import scalafix.internal.sbt.Arg.ToolClasspath
import scalafix.internal.sbt._
import scalafix.internal.sbt.*

import scala.collection.JavaConverters.collectionAsScalaIterableConverter
import scala.util.control.NoStackTrace
@@ -150,31 +149,32 @@ object ScalafixPlugin extends AutoPlugin {
Invisible
)

private val adaptSbtResolvers = Def.task {
val credentialsByHost = Credentials
.allDirect(credentials.value)
.map(dc =>
dc.host -> coursierapi.Credentials.of(
dc.userName,
dc.passwd
private val adaptSbtResolvers: Def.Initialize[Task[Seq[Repository]]] =
Def.task {
val credentialsByHost = Credentials
.allDirect(credentials.value)
.map(dc =>
dc.host -> coursierapi.Credentials.of(
dc.userName,
dc.passwd
)
)
)
.toMap
.toMap

resolvers.value.flatMap(resolver => {
val adaptedRepo = CoursierRepoResolvers.repository(
resolver,
stdoutLogger,
credentialsByHost
)
if (adaptedRepo.isEmpty) {
stdoutLogger.warn(
s"Defined resolver $resolver cannot be converted to coursier repository, it will be ignored by scalafix."
resolvers.value.flatMap(resolver => {
val adaptedRepo = CoursierRepoResolvers.repository(
resolver,
stdoutLogger,
credentialsByHost
)
}
adaptedRepo
})
}
if (adaptedRepo.isEmpty) {
stdoutLogger.warn(
s"Defined resolver $resolver cannot be converted to coursier repository, it will be ignored by scalafix."
)
}
adaptedRepo
})
}

private lazy val cachingStyle = {
val useLastModifiedCachingStyle =