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

Merge pull request #197 from eikek/scala-update

Browse Source 
Update scala to 2.13.3
This commit is contained in:
mergify[bot] 2020-07-31 23:20:55 +00:00 committed by GitHub
commit 4a52d95896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: scala language: scala
scala: scala:
- 2.13.2 - 2.13.3
jdk: jdk:
- openjdk8 - openjdk8

5
build.sbt
View File

@ -17,7 +17,7 @@ val scalafixSettings = Seq(
val sharedSettings = Seq( val sharedSettings = Seq(
organization := "com.github.eikek", organization := "com.github.eikek",
scalaVersion := "2.13.2", scalaVersion := "2.13.3",
scalacOptions ++= Seq( scalacOptions ++= Seq(
"-deprecation", "-deprecation",
"-encoding", "-encoding",
@ -26,7 +26,8 @@ val sharedSettings = Seq(
"-feature", "-feature",
"-Werror", // fail when there are warnings "-Werror", // fail when there are warnings
"-unchecked", "-unchecked",
"-Xlint:_", // remove -byname-implicit, once https://github.com/scala/bug/issues/12072 is resolved
"-Xlint:-byname-implicit,_",
"-Wdead-code", "-Wdead-code",
"-Wunused", "-Wunused",
"-Wvalue-discard", "-Wvalue-discard",

2
modules/convert/src/test/scala/docspell/convert/FileChecks.scala
View File

@ -18,7 +18,7 @@ trait FileChecks {
Files.exists(p) && Files.size(p) > 0 Files.exists(p) && Files.size(p) > 0
def isType(mime: MimeType): Boolean = def isType(mime: MimeType): Boolean =
TikaMimetype.detect[IO](p).map(_ == mime).unsafeRunSync TikaMimetype.detect[IO](p).map(_ == mime).unsafeRunSync()
def isPDF: Boolean = def isPDF: Boolean =
isType(MimeType.pdf) isType(MimeType.pdf)

6
modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala vendored
View File

@ -41,7 +41,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
assert(p.isNonEmpty && p.isPDF) assert(p.isNonEmpty && p.isPDF)
} }
) )
.unsafeRunSync .unsafeRunSync()
} }
test("convert office to pdf") { test("convert office to pdf") {
@ -69,7 +69,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
assert(p.isNonEmpty && p.isPDF) assert(p.isNonEmpty && p.isPDF)
} }
) )
.unsafeRunSync .unsafeRunSync()
} }
test("convert image to pdf") { test("convert image to pdf") {
@ -98,7 +98,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
assert(txt.isNonEmpty && txt.isPlainText) assert(txt.isNonEmpty && txt.isPlainText)
} }
) )
.unsafeRunSync .unsafeRunSync()
} }
} }

4
modules/files/src/test/scala/docspell/files/TestFiles.scala
View File

@ -20,10 +20,10 @@ object TestFiles {
lazy val letterDEText = lazy val letterDEText =
ExampleFiles.letter_de_txt ExampleFiles.letter_de_txt
.readText[IO](8 * 1024, blocker) .readText[IO](8 * 1024, blocker)
.unsafeRunSync .unsafeRunSync()
lazy val letterENText = lazy val letterENText =
ExampleFiles.letter_en_txt ExampleFiles.letter_en_txt
.readText[IO](8 * 1024, blocker) .readText[IO](8 * 1024, blocker)
.unsafeRunSync .unsafeRunSync()
} }

2
modules/files/src/test/scala/docspell/files/ZipTest.scala
View File

@ -29,6 +29,6 @@ object ZipTest extends SimpleTestSuite {
} }
.compile .compile
.drain .drain
.unsafeRunSync .unsafeRunSync()
} }
} }