Skip to content
This repository has been archived by the owner on May 22, 2022. It is now read-only.

Config scope: dependencyOverrides in Compile (not Test) #30

Merged
merged 1 commit into from
Oct 7, 2019
Merged

Config scope: dependencyOverrides in Compile (not Test) #30

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 src/main/scala/com/github/tkawachi/sbtlock/SbtLock.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object SbtLock {
s"""// DON'T EDIT THIS FILE.
|// This file is auto generated by ${BuildInfo.name} ${BuildInfo.version}.
|// ${BuildInfo._url}
|dependencyOverrides ++= {
|dependencyOverrides in Compile ++= {
| if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
| ${Compat.dependencyOverridesType}.empty
| } else {
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/sbt-lock/force/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def check(module: Seq[String], dependencies: Set[ModuleID]): Boolean = {

InputKey[Unit]("checkExistsDependency") := {
val module = complete.Parsers.spaceDelimited("").parsed
val exists = check(module, dependencyOverrides.value.toSet)
val exists = check(module, (dependencyOverrides in Compile).value.toSet)
assert(
exists,
s"${module.mkString(":")} should exist in dependencyOverrides: ${dependencyOverrides.value}")
s"${module.mkString(":")} should exist in dependencyOverrides: ${(dependencyOverrides in Compile).value}")
}
8 changes: 4 additions & 4 deletions src/sbt-test/sbt-lock/simple/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ def check(module: Seq[String], dependencies: Set[ModuleID]): Boolean = {

InputKey[Unit]("checkExistsDependency") := {
val module = complete.Parsers.spaceDelimited("").parsed
val exists = check(module, dependencyOverrides.value.toSet)
val exists = check(module, (dependencyOverrides in Compile).value.toSet)
assert(
exists,
s"${module.mkString(":")} should exist in dependencyOverrides: ${dependencyOverrides.value}")
s"${module.mkString(":")} should exist in dependencyOverrides: ${(dependencyOverrides in Compile).value}")
}

InputKey[Unit]("checkAbsentDependency") := {
val module = complete.Parsers.spaceDelimited("").parsed
val exists = check(module, dependencyOverrides.value.toSet)
val exists = check(module, (dependencyOverrides in Compile).value.toSet)
assert(
!exists,
s"${module.mkString(":")} should not exist in dependencyOverrides: ${dependencyOverrides.value}")
s"${module.mkString(":")} should not exist in dependencyOverrides: ${(dependencyOverrides in Compile).value}")
}

InputKey[Unit]("addDependency") := {
Expand Down