Skip to content

Fix bad defined dependency #1930

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 1 commit into from
Jan 22, 2023
Merged

Fix bad defined dependency #1930

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 build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ val ftspsql = project
Dependencies.postgres ++
Dependencies.flyway
)
.dependsOn(common, ftsclient, store % "compile->test;test->test")
.dependsOn(common, ftsclient, store % "compile->compile;test->test")

val restapi = project
.in(file("modules/restapi"))
Expand Down
1 change: 1 addition & 0 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ object Dependencies {
ExclusionRule("com.sun.xml.bind", "jaxb-core"),
ExclusionRule("javax.xml.bind", "jaxb-api"),
ExclusionRule("javax.activation"),
ExclusionRule("junit", "junit"),
ExclusionRule("de.jollyday", "jollyday"),
ExclusionRule("com.apple", "AppleJavaExtensions"),
ExclusionRule("org.glassfish", "javax.json")
Expand Down
10 changes: 4 additions & 6 deletions project/TestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ object TestSettingsPlugin extends AutoPlugin {
ds.fold(d0)(_ ++ _).map(_ % Test)

implicit class ProjectTestSettingsSyntax(project: Project) {
def withTestSettings =
def withTestSettings: Project =
project.settings(testSettings)

def withTestSettingsDependsOn(p: Project, ps: Project*) =
(p :: ps.toList).foldLeft(project) { (cur, dep) =>
cur.dependsOn(dep % "test->test,compile")
}
def withTestSettingsDependsOn(p: Project, ps: Project*): Project =
withTestSettings.dependsOn((p +: ps).map(_ % "test->test"): _*)
}

implicit class CrossprojectTestSettingsSyntax(project: CrossProject) {
Expand All @@ -29,7 +27,7 @@ object TestSettingsPlugin extends AutoPlugin {
import autoImport._

val testSettings = Seq(
libraryDependencies ++= inTest(Dependencies.munit, Dependencies.scribe),
libraryDependencies ++= (Dependencies.munit ++ Dependencies.scribe).map(_ % Test),
testFrameworks += TestFrameworks.MUnit
)

Expand Down