Skip to content

Commit

Permalink
Merge branch 'main' into ox-app
Browse files Browse the repository at this point in the history
  • Loading branch information
adamw authored Sep 23, 2024
2 parents 289e8c6 + a97cc52 commit 9912572
Show file tree
Hide file tree
Showing 5 changed files with 341 additions and 198 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/adopt-tapir-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ on:
release:
types:
- released
paths-ignore:
- "helm/**"

jobs:
verify_unit_tests_lint:
Expand Down Expand Up @@ -65,16 +63,6 @@ jobs:
with:
jvm: ${{ matrix.stack == 'OxStack' && 'temurin:21' || 'temurin:17' }}

- name: Cache SBT
id: cache-sbt
uses: actions/cache@v4
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier
key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}

- name: Run integration tests for ${{ matrix.stack }}, ${{ matrix.scala }} with ${{ matrix.json }} JSON support
run: SCALA=${{ matrix.scala }} JSON=${{ matrix.json }} STACK=${{ matrix.stack }} IT_TESTS_THREADS_NO=1 sbt 'ItTest / test'

Expand Down Expand Up @@ -119,16 +107,6 @@ jobs:
java-version: 21
cache: 'sbt'

- name: Cache SBT
id: cache-sbt
uses: actions/cache@v4
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier
key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}

- name: Login to DockerHub
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 3.8.2
version = 3.8.3
maxColumn = 140
runner.dialect = scala3
28 changes: 14 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ import scala.sys.process.Process
import scala.util.Try

val scala2Version = "2.13.14"
val scala3Version = "3.4.2"
val scala3Version = "3.5.0"

val tapirVersion = "1.10.13"
val tapirVersion = "1.11.4"

val http4sEmberServerVersion = "0.23.27"
val http4sCirceVersion = "0.23.27"
val circeVersion = "0.14.9"
val http4sEmberServerVersion = "0.23.28"
val http4sCirceVersion = "0.23.28"
val circeVersion = "0.14.10"
val circeGenericsExtrasVersion = "0.14.3"
val sttpVersion = "3.9.7"
val sttpVersion = "3.9.8"
val prometheusVersion = "0.16.0"
val scalafmtVersion = "3.8.1"
val scalafmtVersion = "3.8.3"
val scalaLoggingVersion = "3.9.5"
val logbackClassicVersion = "1.5.6"
val logbackClassicVersion = "1.5.8"
val scalaTestVersion = "3.2.19"
val plokhotnyukJsoniterVersion = "2.30.6"
val plokhotnyukJsoniterVersion = "2.30.11"
val zioTestVersion = "2.0.13"

val httpDependencies = Seq(
Expand Down Expand Up @@ -54,12 +54,12 @@ val loggingDependencies = Seq(
"com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
"ch.qos.logback" % "logback-classic" % logbackClassicVersion,
"org.codehaus.janino" % "janino" % "3.1.12" % Runtime,
"net.logstash.logback" % "logstash-logback-encoder" % "7.4" % Runtime
"net.logstash.logback" % "logstash-logback-encoder" % "8.0" % Runtime
)

val fileDependencies = Seq(
"com.github.pathikrit" %% "better-files" % "3.9.2" cross CrossVersion.for3Use2_13,
"org.apache.commons" % "commons-compress" % "1.26.2"
"org.apache.commons" % "commons-compress" % "1.27.1"
)

val configDependencies = Seq(
Expand All @@ -69,7 +69,7 @@ val configDependencies = Seq(
val baseDependencies = Seq(
"org.typelevel" %% "cats-effect" % "3.5.4",
"com.softwaremill.common" %% "tagging" % "2.3.5",
"com.softwaremill.quicklens" %% "quicklens" % "1.9.7"
"com.softwaremill.quicklens" %% "quicklens" % "1.9.9"
)

val apiDocsDependencies = Seq(
Expand All @@ -82,8 +82,8 @@ val scalafmtStandaloneDependencies = Seq(

val unitTestingStack = Seq(
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
"org.scalacheck" %% "scalacheck" % "1.18.0" % Test,
"com.lihaoyi" %% "os-lib" % "0.10.2" % Test
"org.scalacheck" %% "scalacheck" % "1.18.1" % Test,
"com.lihaoyi" %% "os-lib" % "0.10.7" % Test
)

val commonDependencies =
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % "

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")

addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")

addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")

Expand Down
Loading

0 comments on commit 9912572

Please sign in to comment.