TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 17:55:06 +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
Show Stats 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 // --- Modules
val common = project.in(file("modules/common")). val common = project.in(file("modules/common")).
@ -217,7 +213,7 @@ val joex = project.in(file("modules/joex")).
addCompilerPlugin(Dependencies.kindProjectorPlugin), addCompilerPlugin(Dependencies.kindProjectorPlugin),
addCompilerPlugin(Dependencies.betterMonadicFor), addCompilerPlugin(Dependencies.betterMonadicFor),
buildInfoPackage := "docspell.joex", 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) ).dependsOn(store, text, joexapi, restapi)
val backend = project.in(file("modules/backend")). val backend = project.in(file("modules/backend")).
@ -278,7 +274,7 @@ val restserver = project.in(file("modules/restserver")).
, streams.value.log) , streams.value.log)
}.taskValue, }.taskValue,
Compile/unmanagedResourceDirectories ++= Seq((Compile/resourceDirectory).value.getParentFile/"templates"), 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) ).dependsOn(restapi, joexapi, backend, webapp)
val microsite = project.in(file("modules/microsite")). 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-zip", ";restserver/universal:packageBin ;joex/universal:packageBin")
addCommandAlias("make-deb", ";restserver/debian:packageBin ;joex/debian: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")

9
modules/microsite/docs/dev.md
View File

@ -15,6 +15,7 @@ the sources and run:
- `make` to compile all sources (Elm + Scala) - `make` to compile all sources (Elm + Scala)
- `make-zip` to create zip packages - `make-zip` to create zip packages
- `make-deb` to create debian packages - `make-deb` to create debian packages
- `make-pkg` for a clean compile + building all packages (zip + deb)
The zip files can be found afterwards in: The zip files can be found afterwards in:
@ -46,10 +47,10 @@ results in recompile+restart once a source file is modified.
## Custom config file ## Custom config file
The sbt build is setup such that a file `dev.conf` in the root of the The sbt build is setup such that a file `dev.conf` in the directory
source tree is picked up as config file, if it exists. So you can `local` (at root of the source tree) is picked up as config file, if
create a custom config file for development. For example, a custom it exists. So you can create a custom config file for development. For
database for development may be setup this way: example, a custom database for development may be setup this way:
``` ```
#jdbcurl = "jdbc:h2:///home/dev/workspace/projects/docspell/local/docspell-demo.db;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE;AUTO_SERVER=TRUE" #jdbcurl = "jdbc:h2:///home/dev/workspace/projects/docspell/local/docspell-demo.db;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE;AUTO_SERVER=TRUE"

2
modules/store/src/main/scala/docspell/store/impl/DoobieMeta.scala
View File

@ -7,6 +7,8 @@ import docspell.common.Timestamp
import docspell.common._ import docspell.common._
import doobie._ import doobie._
//import doobie.implicits.javatime._
import doobie.implicits.legacy.instant._
import doobie.util.log.Success import doobie.util.log.Success
import io.circe.{Decoder, Encoder} import io.circe.{Decoder, Encoder}
import docspell.common.syntax.all._ import docspell.common.syntax.all._

4
project/Dependencies.scala
View File

@ -6,9 +6,9 @@ object Dependencies {
val BcryptVersion = "0.4" val BcryptVersion = "0.4"
val BetterMonadicForVersion = "0.3.1" val BetterMonadicForVersion = "0.3.1"
val BitpeaceVersion = "0.4.1" val BitpeaceVersion = "0.4.2"
val CirceVersion = "0.12.3" val CirceVersion = "0.12.3"
val DoobieVersion = "0.8.7" val DoobieVersion = "0.8.8"
val FastparseVersion = "2.1.3" val FastparseVersion = "2.1.3"
val FlywayVersion = "6.1.3" val FlywayVersion = "6.1.3"
val Fs2Version = "2.1.0" val Fs2Version = "2.1.0"