Merge branch 'main' into feature/fixtures

Signed-off-by: Alejandro Hernández <info@alejandrohdezma.com>
alejandrohdezma · Jul 28, 2023 · 690fa07 · 690fa07
2 parents 111d6e2 + ec99779
commit 690fa07
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,11 +58,11 @@ jobs:
           - 17
     steps:
       - name: Checkout project
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with:
           distribution: "liberica"
           java-version: ${{ matrix.jdk }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,15 +29,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           fetch-depth: 0
 
       - name: Check latest tag follows semantic versioning
         if: github.event_name == 'push'
         uses: alejandrohdezma/actions/check-semver-tag@v1
 
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with:
           distribution: "liberica"
           java-version: "11"
@@ -59,13 +59,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           fetch-depth: 0
           ref: main
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
 
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with:
           distribution: "liberica"
           java-version: "17"

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
-val Scala3 = "3.2.1" // scala-steward:off
-ThisBuild / scalaVersion       := "2.13.10"
-ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.10", Scala3)
+val Scala3 = "3.3.0" // scala-steward:off
+ThisBuild / scalaVersion       := "2.13.11"
+ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.11", Scala3)
 
 ThisBuild / organization := "com.alejandrohdezma"
 
@@ -11,20 +11,20 @@ addCommandAlias("ci-publish", "github; ci-release")
 lazy val documentation = project
   .enablePlugins(MdocPlugin)
   .dependsOn(`http4s-munit` % "compile->test")
-  .settings(libraryDependencies += "org.http4s" %% "http4s-blaze-client" % "0.23.14")
+  .settings(libraryDependencies += "org.http4s" %% "http4s-blaze-client" % "0.23.15")
 
 lazy val `http4s-munit` = module
   .settings(Test / fork := true)
   .settings(libraryDependencies += "org.scalameta" %% "munit" % "0.7.29")
-  .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.18")
-  .settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.18")
-  .settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.18" % Optional)
+  .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.22")
+  .settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.22")
+  .settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.22" % Optional)
   .settings(libraryDependencies += "org.typelevel" %% "munit-cats-effect-3" % "1.0.7")
   .settings(libraryDependencies += "io.circe" %% "circe-parser" % "0.14.5")
-  .settings(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.7" % Test)
-  .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.18" % Test)
-  .settings(libraryDependencies += "com.dimafeng" %% "testcontainers-scala-munit" % "0.40.15" % Test)
-  .settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.18" % Test)
+  .settings(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.8" % Test)
+  .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.22" % Test)
+  .settings(libraryDependencies += "com.dimafeng" %% "testcontainers-scala-munit" % "0.40.16" % Test)
+  .settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.22" % Test)
   .settings(
     libraryDependencies ++= CrossVersion
       .partialVersion(scalaVersion.value)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,14 +1,14 @@
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"          % "0.10.4")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-ci"                % "2.13.1")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-fix"               % "0.7.0")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-github-mdoc"       % "0.11.8")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-github-header"     % "0.11.8")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafix-defaults" % "0.10.0")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafmt-defaults" % "0.8.0")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"          % "0.11.0")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-ci"                % "2.13.3")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-fix"               % "0.7.1")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-github-mdoc"       % "0.11.11")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-github-header"     % "0.11.11")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafix-defaults" % "0.11.0")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafmt-defaults" % "0.9.0")
 addSbtPlugin("com.alejandrohdezma"       % "sbt-modules"           % "0.2.0")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-mdoc-toc"          % "0.4.0")
-addSbtPlugin("com.github.sbt"            % "sbt-ci-release"        % "1.5.11")
-addSbtPlugin("de.heikoseeberger"         % "sbt-header"            % "5.9.0")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"          % "0.4.2")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-mdoc-toc"          % "0.4.1")
+addSbtPlugin("com.github.sbt"            % "sbt-ci-release"        % "1.5.12")
+addSbtPlugin("de.heikoseeberger"         % "sbt-header"            % "5.10.0")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"          % "0.4.4")
 addSbtPlugin("org.scalameta"             % "sbt-mdoc"              % "2.3.7")
 addSbtPlugin("org.scalameta"             % "sbt-scalafmt"          % "2.5.0")