diff --git a/.scalafmt.conf b/.scalafmt.conf index e5640c5..09037e8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version="3.8.1" +version="3.8.3" runner.dialect=scala3 align.preset=most maxColumn=120 diff --git a/build.sbt b/build.sbt index e180f71..59b3dd2 100644 --- a/build.sbt +++ b/build.sbt @@ -15,9 +15,9 @@ lazy val commonSettings = Seq( ) lazy val exampleApps = Seq( - "org.twelvehart.unstructured4s.examples.BasicApp", "org.twelvehart.unstructured4s.examples.ZIOApp", - "org.twelvehart.unstructured4s.examples.CatsEffectApp" + "org.twelvehart.unstructured4s.examples.CatsEffectApp", + "org.twelvehart.unstructured4s.examples.BasicApp" ) lazy val runExamples = exampleApps.map(app => s"examples/runMain $app").mkString(";") diff --git a/core/src/main/scala/org/twelvehart/unstructured4s/model/domain.scala b/core/src/main/scala/org/twelvehart/unstructured4s/model/domain.scala index ec8166f..2128db2 100644 --- a/core/src/main/scala/org/twelvehart/unstructured4s/model/domain.scala +++ b/core/src/main/scala/org/twelvehart/unstructured4s/model/domain.scala @@ -5,7 +5,6 @@ import sttp.client3.* import sttp.model.Uri import sttp.model.Part -import scala.annotation.unused import java.io.File export CanMultipart.given @@ -32,9 +31,8 @@ enum OCRStrategy(val value: String): case Auto extends OCRStrategy("auto") enum OutputFormat(val value: String): - case Json extends OutputFormat("json") - - @unused("csv output is not yet supported by the api") case `Text/Csv` extends OutputFormat("text/csv") + case Json extends OutputFormat("application/json") + case `Text/Csv` extends OutputFormat("text/csv") sealed trait Endpoint(val value: Uri): case object V0 extends Endpoint(uri"https://api.unstructured.io/general/v0/general") diff --git a/examples/src/main/scala/org/twelvehart/unstructured4s/examples/BasicApp.scala b/examples/src/main/scala/org/twelvehart/unstructured4s/examples/BasicApp.scala index 65bd58d..be88447 100644 --- a/examples/src/main/scala/org/twelvehart/unstructured4s/examples/BasicApp.scala +++ b/examples/src/main/scala/org/twelvehart/unstructured4s/examples/BasicApp.scala @@ -21,8 +21,6 @@ object BasicApp: result match case Left(error) => println(s"Error: ${error.getMessage}") - System.exit(1) case Right(value) => println(s"Result: $value") - System.exit(0) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5d1d502..b8d47a1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,18 +1,18 @@ import sbt.* object V { - lazy val zio = "2.0.21" + lazy val zio = "2.0.22" lazy val zioCats = "23.0.0.8" lazy val sttp = "3.9.5" - lazy val circe = "0.14.6" + lazy val circe = "0.14.10" } object Dependencies { - lazy val cats = "org.typelevel" %% "cats-core" % "2.10.0" + lazy val cats = "org.typelevel" %% "cats-core" % "2.12.0" lazy val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.4" lazy val catsEffectTesting = "org.typelevel" %% "cats-effect-testing-scalatest" % "1.5.0" % Test - lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.18" % Test + lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0" % Test lazy val sttpFs2 = "com.softwaremill.sttp.client3" %% "fs2" % V.sttp @@ -28,7 +28,7 @@ object Dependencies { lazy val zio = "dev.zio" %% "zio" % V.zio lazy val zioTestSbt = "dev.zio" %% "zio-test-sbt" % V.zio lazy val zioCats = "dev.zio" %% "zio-interop-cats" % V.zioCats - lazy val loggingFrontend = "ch.qos.logback" % "logback-classic" % "1.5.3" + lazy val loggingFrontend = "ch.qos.logback" % "logback-classic" % "1.5.8" lazy val zioSlf4j = "dev.zio" %% "zio-logging-slf4j" % "2.2.2" lazy val core: Seq[ModuleID] = Seq( diff --git a/project/build.properties b/project/build.properties index a9edab7..bcfa43e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ -sbt.version = 1.9.9 +sbt.version = 1.10.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2d25721..029d076 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.6.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") +addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0") addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0") addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("nl.gn0s1s" % "sbt-dotenv" % "3.0.0") -addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") diff --git a/publish.sbt b/publish.sbt index 7ea4952..86974ab 100644 --- a/publish.sbt +++ b/publish.sbt @@ -21,7 +21,7 @@ ThisBuild / developers := List( ) ThisBuild / description := "Unstructured4s is a Scala library for working with unstructured.io API" -ThisBuild / licenses := List("The MIT License" -> new URL("https://opensource.org/license/mit/")) +ThisBuild / licenses := List("The MIT License" -> url("https://opensource.org/license/mit/")) ThisBuild / homepage := Some(url("https://unstructured4s.twelvehart.org/")) // Remove all additional repository other than Maven Central from POM