Skip to content

Include dependency overrides in list of dependencies to update #61

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 8, 2024
Merged

Include dependency overrides in list of dependencies to update #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9fe980
Include dependency overrides in list of dependencies to update
collinkueteraxoni Sep 27, 2024
529d9a6
revert import changes
collinkueter Sep 30, 2024
a28311e
fix import formatting
collinkueter Sep 30, 2024
c7cb895
also add dependency overrides to 1_0_0
collinkueter Sep 30, 2024
874310f
Merge branch 'update-dependency-overrides' of github.com:collinkueter…
collinkueter Sep 30, 2024
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
5 changes: 4 additions & 1 deletion ...les/sbt-plugin-1_0_0/src/main/scala/org/scalasteward/sbt/plugin/StewardPlugin_1_0_0.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ object StewardPlugin_1_0_0 extends AutoPlugin {
val libraryDeps = libraryDependencies.value
.map(moduleId => toDependency(moduleId, scalaVersionValue, scalaBinaryVersionValue))

val dependencyOverrides = Keys.dependencyOverrides.value
.map(moduleId => toDependency(moduleId, scalaVersionValue, scalaBinaryVersionValue))

val scalafixScalaBinaryVersion = findScalafixScalaBinaryVersion.value.getOrElse("2.12")

val scalafixDeps = findScalafixDependencies.value
Expand All @@ -52,7 +55,7 @@ object StewardPlugin_1_0_0 extends AutoPlugin {
Some("scalafix-rule")
)
)
val dependencies = libraryDeps ++ scalafixDeps
val dependencies = libraryDeps ++ scalafixDeps ++ dependencyOverrides

def getCredentials(url: URL, name: String): Option[Resolver.Credentials] =
(for {
Expand Down
5 changes: 4 additions & 1 deletion ...s/sbt-plugin-1_3_11/src/main/scala/org/scalasteward/sbt/plugin/StewardPlugin_1_3_11.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ object StewardPlugin_1_3_11 extends AutoPlugin {
val libraryDeps = libraryDependencies.value
.map(moduleId => toDependency(moduleId, scalaVersionValue, scalaBinaryVersionValue))

val dependencyOverrides = Keys.dependencyOverrides.value
.map(moduleId => toDependency(moduleId, scalaVersionValue, scalaBinaryVersionValue))

val scalafixScalaBinaryVersion = findScalafixScalaBinaryVersion.value.getOrElse("2.12")

val scalafixDeps = findScalafixDependencies.value
Expand All @@ -52,7 +55,7 @@ object StewardPlugin_1_3_11 extends AutoPlugin {
Some("scalafix-rule")
)
)
val dependencies = libraryDeps ++ scalafixDeps
val dependencies = libraryDeps ++ scalafixDeps ++ dependencyOverrides

def getCredentials(host: String, name: String): Option[Resolver.Credentials] =
(for {
Expand Down