TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1930 from eikek/1856-fix-wrong-depndencies

Browse Source 
Fix bad defined dependency
This commit is contained in:
mergify[bot] 2023-01-22 21:01:36 +00:00 committed by GitHub
commit e9620272ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -662,7 +662,7 @@ val ftspsql = project
Dependencies.postgres ++ Dependencies.postgres ++
Dependencies.flyway Dependencies.flyway
) )
.dependsOn(common, ftsclient, store % "compile->test;test->test") .dependsOn(common, ftsclient, store % "compile->compile;test->test")
val restapi = project val restapi = project
.in(file("modules/restapi")) .in(file("modules/restapi"))

1
project/Dependencies.scala
View File

@ -198,6 +198,7 @@ object Dependencies {
ExclusionRule("com.sun.xml.bind", "jaxb-core"), ExclusionRule("com.sun.xml.bind", "jaxb-core"),
ExclusionRule("javax.xml.bind", "jaxb-api"), ExclusionRule("javax.xml.bind", "jaxb-api"),
ExclusionRule("javax.activation"), ExclusionRule("javax.activation"),
ExclusionRule("junit", "junit"),
ExclusionRule("de.jollyday", "jollyday"), ExclusionRule("de.jollyday", "jollyday"),
ExclusionRule("com.apple", "AppleJavaExtensions"), ExclusionRule("com.apple", "AppleJavaExtensions"),
ExclusionRule("org.glassfish", "javax.json") ExclusionRule("org.glassfish", "javax.json")

10
project/TestSettings.scala
View File

@ -10,13 +10,11 @@ object TestSettingsPlugin extends AutoPlugin {
ds.fold(d0)(_ ++ _).map(_ % Test) ds.fold(d0)(_ ++ _).map(_ % Test)
implicit class ProjectTestSettingsSyntax(project: Project) { implicit class ProjectTestSettingsSyntax(project: Project) {
def withTestSettings = def withTestSettings: Project =
project.settings(testSettings) project.settings(testSettings)
def withTestSettingsDependsOn(p: Project, ps: Project*) = def withTestSettingsDependsOn(p: Project, ps: Project*): Project =
(p :: ps.toList).foldLeft(project) { (cur, dep) => withTestSettings.dependsOn((p +: ps).map(_ % "test->test"): _*)
cur.dependsOn(dep % "test->test,compile")
}
} }
implicit class CrossprojectTestSettingsSyntax(project: CrossProject) { implicit class CrossprojectTestSettingsSyntax(project: CrossProject) {
@ -29,7 +27,7 @@ object TestSettingsPlugin extends AutoPlugin {
import autoImport._ import autoImport._
val testSettings = Seq( val testSettings = Seq(
libraryDependencies ++= inTest(Dependencies.munit, Dependencies.scribe), libraryDependencies ++= (Dependencies.munit ++ Dependencies.scribe).map(_ % Test),
testFrameworks += TestFrameworks.MUnit testFrameworks += TestFrameworks.MUnit
) )