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.

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

fix runtime dependency resolution issue #5

Merged
merged 1 commit into from
Jun 29, 2024
Merged

fix runtime dependency resolution issue #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sbt-version-policy/src/main/scala/sbtversionpolicy/SbtVersionPolicySettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ object SbtVersionPolicySettings {
val sv = scalaVersion.value
val sbv = scalaBinaryVersion.value

val compileReport = update.value.configuration(Compile).getOrElse {
val compileReport = update.value.configuration(Runtime).getOrElse {
sys.error("Compile configuration not found in update report")
}

Expand Down
5 changes: 2 additions & 3 deletions sbt-version-policy/src/main/scala/sbtversionpolicy/internal/DependencyCheck.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ package sbtversionpolicy.internal

import coursier.version.{ModuleMatchers, VersionCompatibility}
import sbt.Compile
import sbt.librarymanagement.{ConfigurationReport, CrossVersion, ModuleID}
import sbt.librarymanagement.{ConfigurationReport, CrossVersion, DependencyResolution, ModuleID, ScalaModuleInfo, UnresolvedWarningConfiguration, UpdateConfiguration, syntax}
import sbt.util.Logger
import sbt.librarymanagement.{DependencyResolution, ScalaModuleInfo, UnresolvedWarningConfiguration, UpdateConfiguration}
import sbtversionpolicy.DependencyCheckReport

object DependencyCheck {
Expand Down Expand Up @@ -66,7 +65,7 @@ object DependencyCheck {

val previousReport = depRes.update(mod, updateConfig, warningConfig, log)
.fold(thing => throw thing.resolveException, identity)
val previousCompileReport = previousReport.configuration(Compile).getOrElse {
val previousCompileReport = previousReport.configuration(syntax.Runtime).getOrElse {
sys.error(s"Compile configuration not found in previous update report $previousReport")
}
val previousDependencies = DependencyCheck.modulesOf(previousCompileReport, excludedModules, sv, sbv, moduleToVersion, log)
Expand Down