TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 09:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update doobie, use legacy java.time conversions

Browse Source
This commit is contained in:
Eike Kettner
2019-12-31 13:00:16 +01:00
parent 65641d1347
commit d05e919eb4
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.sbt
View File

@ -122,10 +122,6 @@ val openapiScalaSettings = Seq(
}))
)
val reStartSettings = Seq(
javaOptions in reStart ++= Seq(s"-Dconfig.file=${(LocalRootProject/baseDirectory).value/"dev.conf"}")
)
// --- Modules
val common = project.in(file("modules/common")).
@ -217,7 +213,7 @@ val joex = project.in(file("modules/joex")).
addCompilerPlugin(Dependencies.kindProjectorPlugin),
addCompilerPlugin(Dependencies.betterMonadicFor),
buildInfoPackage := "docspell.joex",
reStart/javaOptions ++= Seq(s"-Dconfig.file=${(LocalRootProject/baseDirectory).value/"dev.conf"}")
reStart/javaOptions ++= Seq(s"-Dconfig.file=${(LocalRootProject/baseDirectory).value/"local"/"dev.conf"}")
).dependsOn(store, text, joexapi, restapi)
val backend = project.in(file("modules/backend")).
@ -278,7 +274,7 @@ val restserver = project.in(file("modules/restserver")).
, streams.value.log)
}.taskValue,
Compile/unmanagedResourceDirectories ++= Seq((Compile/resourceDirectory).value.getParentFile/"templates"),
reStart/javaOptions ++= Seq(s"-Dconfig.file=${(LocalRootProject/baseDirectory).value/"dev.conf"}")
reStart/javaOptions ++= Seq(s"-Dconfig.file=${(LocalRootProject/baseDirectory).value/"local"/"dev.conf"}")
).dependsOn(restapi, joexapi, backend, webapp)
val microsite = project.in(file("modules/microsite")).
@ -401,7 +397,7 @@ def createWebjarSource(wj: Seq[ModuleID], out: File): Seq[File] = {
}
addCommandAlias("make", ";root/openapiCodegen ;root/test:compile")
addCommandAlias("make", ";set webapp/elmCompileMode := ElmCompileMode.Production ;root/openapiCodegen ;root/test:compile")
addCommandAlias("make-zip", ";restserver/universal:packageBin ;joex/universal:packageBin")
addCommandAlias("make-deb", ";restserver/debian:packageBin ;joex/debian:packageBin")
addCommandAlias("make-pkg", ";make-zip ;make-deb")
addCommandAlias("make-pkg", ";clean ;make ;make-zip ;make-deb")