From 71f996df6eebea900f52aa1bd1b34c20bba87d25 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 22 May 2024 10:25:45 +0200 Subject: [PATCH] Fix scripted project/internal-dependency-configuration --- .../internal-dependency-configurations/build.sbt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt b/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt index 06a8556dd..f65b34710 100644 --- a/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt +++ b/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt @@ -23,31 +23,31 @@ def getConfigs(key: SettingKey[Seq[(ProjectRef, Set[String])]]): val checkA = taskKey[Unit]("Verify that project a's internal dependencies are as expected") checkA := { val compileDeps = getConfigs(a / Compile / internalDependencyConfigurations).value - assert(compileDeps == Map("a" -> Set("compile"))) + assert(compileDeps == Map("a" -> Set("compile", "optional", "provided", "compile-internal"))) val testDeps = getConfigs(a / Test / internalDependencyConfigurations).value - assert(testDeps == Map("a" -> Set("compile", "runtime", "test"))) + assert(testDeps == Map("a" -> Set("compile", "optional", "provided", "runtime", "test", "test-internal")), testDeps.mkString(", ")) } val checkB = taskKey[Unit]("Verify that project b's internal dependencies are as expected") checkB := { val compileDeps = getConfigs(b / Compile / internalDependencyConfigurations).value - assert(compileDeps == Map("b" -> Set("compile"), "a" -> Set("compile"))) + assert(compileDeps == Map("b" -> Set("compile", "optional", "provided", "compile-internal"), "a" -> Set("compile"))) val testDeps = getConfigs(b / Test / internalDependencyConfigurations).value - assert(testDeps == Map("b" -> Set("compile", "runtime", "test"), "a" -> Set("compile"))) + assert(testDeps == Map("b" -> Set("compile", "optional", "provided", "runtime", "test", "test-internal"), "a" -> Set("compile"))) } val checkC = taskKey[Unit]("Verify that project c's internal dependencies are as expected") checkC := { val compileDeps = getConfigs(c / Compile / internalDependencyConfigurations).value - assert(compileDeps == Map("c" -> Set("compile"))) + assert(compileDeps == Map("c" -> Set("compile", "optional", "provided", "compile-internal"))) val testDeps = getConfigs(c / Test / internalDependencyConfigurations).value - assert(testDeps == Map("c" -> Set("compile", "runtime", "test"))) + assert(testDeps == Map("c" -> Set("compile", "optional", "provided", "runtime", "test", "test-internal"))) } val checkD = taskKey[Unit]("Verify that project d's internal dependencies are as expected") checkD := { val compileDeps = getConfigs(d / Compile / internalDependencyConfigurations).value - assert(compileDeps == Map("d" -> Set("compile"), "c" -> Set("compile"))) + assert(compileDeps == Map("d" -> Set("compile", "optional", "provided", "compile-internal"), "c" -> Set("compile"))) val testDeps = getConfigs(d / Test / internalDependencyConfigurations).value - assert(testDeps == Map("d" -> Set("compile", "runtime", "test"), "c" -> Set("compile", "test"))) + assert(testDeps == Map("d" -> Set("compile", "optional", "provided", "runtime", "test", "test-internal"), "c" -> Set("compile", "test"))) }