Merge pull request #30 from htmldoug/inCompile

Config scope: dependencyOverrides in Compile (not Test)
tkawachi · Oct 7, 2019 · 18ca296 · 18ca296
2 parents 33f30b3 + 06b58ba
commit 18ca296
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/scala/com/github/tkawachi/sbtlock/SbtLock.scala b/src/main/scala/com/github/tkawachi/sbtlock/SbtLock.scala
@@ -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 {

diff --git a/src/sbt-test/sbt-lock/force/build.sbt b/src/sbt-test/sbt-lock/force/build.sbt
@@ -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}")
 }
diff --git a/src/sbt-test/sbt-lock/simple/build.sbt b/src/sbt-test/sbt-lock/simple/build.sbt
@@ -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") := {