Skip to content

Commit

Permalink
Updated dependencies. Added compression support
Browse files Browse the repository at this point in the history
  • Loading branch information
hohonuuli committed Jan 28, 2025
1 parent 90cc001 commit c40c28a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
java-version: "21"
distribution: "temurin"
cache: "sbt"
- name: Setup sbt launcher
uses: sbt/setup-sbt@v1
- name: Package and publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
java-version: '21'
distribution: 'temurin'
cache: 'sbt'
- name: Setup sbt launcher
uses: sbt/setup-sbt@v1
- name: Run tests
run: sbt test
env:
Expand Down
12 changes: 1 addition & 11 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import java.net.URI
import Dependencies.*

val tapirVersion = "1.11.8"
val eclipselinkVersion = "4.0.2"
val derbyVersion = "10.16.1.1"
val testcontainersVersion = "0.41.0"

Global / onChangedBuildSource := ReloadOnSourceChanges

ThisBuild / javacOptions ++= Seq("-target", "21", "-source", "21")
ThisBuild / licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
ThisBuild / scalaVersion := "3.5.2"
ThisBuild / scalaVersion := "3.6.3"
// ThisBuild / version := "0.0.1"
ThisBuild / organization := "org.mbari"
ThisBuild / organizationName := "Monterey Bay Aquarium Research Institute"
Expand Down Expand Up @@ -55,11 +50,6 @@ lazy val vampireSquid = (project in file("vampire-squid"))
javacOptions ++= Seq("-target", "17", "-source", "17"),
// licenses += ("Apache-2.0", URI.create("https://www.apache.org/licenses/LICENSE-2.0.txt").toURL),
libraryDependencies ++= Seq(
derby,
derbyClient,
derbyNet,
derbyShared,
derbyTools,
hibernateCore,
hibernateEnvers,
hibernateHikari,
Expand Down
14 changes: 6 additions & 8 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,20 @@ object Dependencies {
lazy val derbyShared = "org.apache.derby" % "derbyshared" % derbyVersion
lazy val derbyTools = "org.apache.derby" % "derbytools" % derbyVersion

// val hibernateVersion = "6.4.8.Final"
val hibernateVersion = "6.6.1.Final"
val hibernateVersion = "6.6.5.Final"
lazy val hibernateCore = "org.hibernate.orm" % "hibernate-core" % hibernateVersion
lazy val hibernateEnvers = "org.hibernate.orm" % "hibernate-envers" % hibernateVersion
lazy val hibernateHikari = "org.hibernate.orm" % "hibernate-hikaricp" % hibernateVersion

lazy val h2 = "com.h2database" % "h2" % "2.1.214"
lazy val jansi = "org.fusesource.jansi" % "jansi" % "2.4.0"
lazy val javaJwt = "com.auth0" % "java-jwt" % "4.4.0"

val logbackVersion = "1.5.12"
val logbackVersion = "1.5.16"
lazy val logbackClassic = "ch.qos.logback" % "logback-classic" % logbackVersion
lazy val logbackCore = "ch.qos.logback" % "logback-core" % logbackVersion

lazy val mssqlJdbc = "com.microsoft.sqlserver" % "mssql-jdbc" % "12.8.1.jre11"
lazy val munit = "org.scalameta" %% "munit" % "1.0.2"
lazy val munit = "org.scalameta" %% "munit" % "1.1.0"
lazy val oracleJdbc = "com.oracle.ojdbc" % "ojdbc8" % "19.3.0.0"
lazy val postgresql = "org.postgresql" % "postgresql" % "42.7.4"
lazy val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
Expand All @@ -38,15 +36,15 @@ object Dependencies {
lazy val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion
lazy val slf4jSystem = "org.slf4j" % "slf4j-jdk-platform-logging" % slf4jVersion

private val tapirVersion = "1.11.8"
lazy val tapirSttpCirce = "com.softwaremill.sttp.client3" %% "circe" % "3.10.1"
private val tapirVersion = "1.11.13"
lazy val tapirSttpCirce = "com.softwaremill.sttp.client3" %% "circe" % "3.10.2"
lazy val tapirCirce = "com.softwaremill.sttp.tapir" %% "tapir-json-circe" % tapirVersion
lazy val tapirPrometheus = "com.softwaremill.sttp.tapir" %% "tapir-prometheus-metrics" % tapirVersion
lazy val tapirServerStub = "com.softwaremill.sttp.tapir" %% "tapir-sttp-stub-server" % tapirVersion
lazy val tapirSwagger = "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion
lazy val tapirVertex = "com.softwaremill.sttp.tapir" %% "tapir-vertx-server" % tapirVersion

val testcontainersVersion = "1.20.3"
val testcontainersVersion = "1.20.4"
lazy val testcontainersCore = "org.testcontainers" % "testcontainers" % testcontainersVersion
lazy val testcontainersSqlserver = "org.testcontainers" % "mssqlserver" % testcontainersVersion
lazy val testcontainersOracle = "org.testcontainers" % "oracle-xe" % testcontainersVersion
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.5
sbt.version=1.10.7
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.mbari.vampiresquid

import io.vertx.core.Vertx
import io.vertx.core.http.HttpServerOptions
import io.vertx.ext.web.Router
import sttp.tapir.server.vertx.{VertxFutureServerInterpreter, VertxFutureServerOptions}
import sttp.tapir.server.vertx.VertxFutureServerInterpreter.VertxFutureToScalaFuture
Expand Down Expand Up @@ -56,8 +57,8 @@ def run(): Unit =
val port = sys.env.get("HTTP_PORT").flatMap(_.toIntOption).getOrElse(8080)

val vertx = Vertx.vertx(new VertxOptions().setWorkerPoolSize(AppConfig.NumberOfVertxWorkers))
// val vertx = Vertx.vertx()
val server = vertx.createHttpServer()
val httpServerOptions = new HttpServerOptions().setCompressionSupported(true)
val server = vertx.createHttpServer(httpServerOptions)
val router = Router.router(vertx)

// NOTE: Don't add a handler. It will intercept all requests (Originally: Log all requests)
Expand Down

0 comments on commit c40c28a

Please sign in to comment.