diff --git a/.scalafmt.conf b/.scalafmt.conf index f460f8d1..95023d27 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.6.0" +version = "2.6.1" preset = defaultWithAlign diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala b/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala index 4c738379..44f89a9f 100644 --- a/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala +++ b/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala @@ -86,7 +86,8 @@ object OUpload { def noSource: UploadResult = NoSource /** When adding files to an item, no item was found using the given - * item-id. */ + * item-id. + */ case object NoItem extends UploadResult def noItem: UploadResult = NoItem diff --git a/modules/common/src/main/scala/docspell/common/CollectiveState.scala b/modules/common/src/main/scala/docspell/common/CollectiveState.scala index a6e6e006..04e42128 100644 --- a/modules/common/src/main/scala/docspell/common/CollectiveState.scala +++ b/modules/common/src/main/scala/docspell/common/CollectiveState.scala @@ -11,14 +11,16 @@ object CollectiveState { /** A collective may be readonly in cases it is implicitly closed * (e.g. no payment). Users can still see there data and - * download, but have no write access. */ + * download, but have no write access. + */ case object ReadOnly extends CollectiveState /** A collective that has been explicitely closed. */ case object Closed extends CollectiveState /** A collective blocked by a super user, usually some emergency - * action. */ + * action. + */ case object Blocked extends CollectiveState def fromString(s: String): Either[String, CollectiveState] = diff --git a/modules/common/src/main/scala/docspell/common/JobState.scala b/modules/common/src/main/scala/docspell/common/JobState.scala index e47475c6..68567dcd 100644 --- a/modules/common/src/main/scala/docspell/common/JobState.scala +++ b/modules/common/src/main/scala/docspell/common/JobState.scala @@ -13,7 +13,8 @@ object JobState { case object Waiting extends JobState {} /** A scheduler has picked up this job and will pass it to the next - * free slot. */ + * free slot. + */ case object Scheduled extends JobState {} /** Is currently executing */ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cc704c7c..71c084c3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,7 @@ object Dependencies { val StanfordNlpVersion = "3.9.2" val TikaVersion = "1.24.1" val YamuscaVersion = "0.6.2" - val SwaggerUIVersion = "3.26.1" + val SwaggerUIVersion = "3.27.0" val SemanticUIVersion = "2.4.1" val TwelveMonkeysVersion = "3.5" val JQueryVersion = "3.5.1" diff --git a/project/NerModelsPlugin.scala b/project/NerModelsPlugin.scala index 4ad2b461..cb658615 100644 --- a/project/NerModelsPlugin.scala +++ b/project/NerModelsPlugin.scala @@ -20,30 +20,34 @@ object NerModelsPlugin extends AutoPlugin { object autoImport { val NerModels = config("NerModels") - val nerModelsFilter = settingKey[String => Boolean]("Which files to keep.") + val nerModelsFilter = settingKey[String => Boolean]("Which files to keep.") val nerModelsRunFilter = taskKey[Seq[File]]("Extract files from libraryDependencies") } import autoImport._ - def nerModelSettings: Seq[Setting[_]] = Seq( - nerModelsFilter := (_ => false), - nerModelsRunFilter := { - filterArtifacts(streams.value.log - , Classpaths.managedJars(NerModels, Set("jar", "zip"), update.value) - , nerModelsFilter.value - , (Compile/resourceManaged).value) - }, - Compile / resourceGenerators += nerModelsRunFilter.taskValue - ) + def nerModelSettings: Seq[Setting[_]] = + Seq( + nerModelsFilter := (_ => false), + nerModelsRunFilter := { + filterArtifacts( + streams.value.log, + Classpaths.managedJars(NerModels, Set("jar", "zip"), update.value), + nerModelsFilter.value, + (Compile / resourceManaged).value + ) + }, + Compile / resourceGenerators += nerModelsRunFilter.taskValue + ) - def nerClassifierSettings: Seq[Setting[_]] = Seq( - libraryDependencies ++= Dependencies.stanfordNlpModels.map(_ % NerModels), - nerModelsFilter := { - name => nerModels.exists(name.endsWith) - } - ) + def nerClassifierSettings: Seq[Setting[_]] = + Seq( + libraryDependencies ++= Dependencies.stanfordNlpModels.map(_ % NerModels), + nerModelsFilter := { name => + nerModels.exists(name.endsWith) + } + ) override def projectConfigurations: Seq[Configuration] = Seq(NerModels) @@ -51,11 +55,16 @@ object NerModelsPlugin extends AutoPlugin { override def projectSettings: Seq[Setting[_]] = nerModelSettings - def filterArtifacts(logger: Logger, cp: Classpath, nameFilter: NameFilter, out: File): Seq[File] = { + def filterArtifacts( + logger: Logger, + cp: Classpath, + nameFilter: NameFilter, + out: File + ): Seq[File] = { logger.info(s"NerModels: Filtering artifacts...") - cp.files.flatMap(f => { + cp.files.flatMap { f => IO.unzip(f, out, nameFilter) - }) + } } private val nerModels = List( diff --git a/project/plugins.sbt b/project/plugins.sbt index 7df4419a..62693ddd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.3") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.3")