Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency Updates #331

Merged
merged 19 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,20 @@ jobs:
- 17
steps:
- name: Checkout project
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.head_ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
fetch-depth: 0

- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
- name: Run Coursier Cache Action
uses: coursier/cache-action@142d2738bd29f0eb9d44610828acb3a19809feab # v6.4.6

- name: Run Coursier Setup Action
uses: coursier/setup-action@62c1c28a0e03df3de0680172df8b829bd80d07a0 # v1.3.7
with:
distribution: "liberica"
java-version: ${{ matrix.jdk }}
cache: "sbt"
jvm: liberica:${{ matrix.jdk }}
apps: sbt

- name: Run `sbt ci-test`
run: sbt ci-test
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
distribution: "liberica"
java-version: "11"
Expand All @@ -59,13 +59,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
ref: main
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
distribution: "liberica"
java-version: "17"
Expand Down
24 changes: 12 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.13.14"
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.3")
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.4")
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible

ThisBuild / organization := "com.alejandrohdezma"
Expand All @@ -11,20 +11,20 @@ addCommandAlias("ci-publish", "versionCheck; github; ci-release")
lazy val documentation = project
.enablePlugins(MdocPlugin)
.dependsOn(`http4s-munit` % "compile->test")
.settings(libraryDependencies += "org.http4s" %% "http4s-blaze-client" % "0.23.16")
.settings(libraryDependencies += "org.http4s" %% "http4s-blaze-client" % "0.23.17")

lazy val `http4s-munit` = module
.settings(Test / fork := true)
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.0.1")
.settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.27")
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.27")
.settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.27" % Optional)
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.0.3")
.settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.30")
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.30")
.settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.30" % Optional)
.settings(libraryDependencies += "org.typelevel" %% "munit-cats-effect" % "2.0.0")
.settings(libraryDependencies += "io.circe" %% "circe-parser" % "0.14.9")
.settings(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.7" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.27" % Test)
.settings(libraryDependencies += "com.dimafeng" %% "testcontainers-scala-munit" % "0.41.4" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.27" % Test)
.settings(libraryDependencies += "io.circe" %% "circe-parser" % "0.14.10")
.settings(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.16" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.30" % Test)
.settings(libraryDependencies += "com.dimafeng" %% "testcontainers-scala-munit" % "0.41.5" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.30" % Test)
.settings(libraryDependencies ++= scalaVersion.value.on(2)(kindProjector))

def kindProjector = compilerPlugin("org.typelevel" % "kind-projector" % "0.13.3").cross(CrossVersion.full)
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ trait Http4sMUnitSyntax extends Http4sDsl[IO] with Http4sClientDsl[IO] with AllS

}

case class ContextNotFound(request: Request[IO])
case class ContextNotFound(request: Request[IO]) // scalafix:ok
extends RuntimeException(s"Auth context not found on request $request, remember to add one with `.context()`")
with NoStackTrace

Expand Down
11 changes: 8 additions & 3 deletions modules/http4s-munit/src/main/scala/munit/Http4sSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,14 @@ trait Http4sSuite extends CatsEffectSuite with Http4sMUnitSyntax {
followingRequests: List[String],
testOptions: TestOptions,
config: Http4sMUnitConfig
): String = Http4sMUnitDefaults.http4sMUnitNameCreator(
request, followingRequests, testOptions, config, http4sMUnitNameCreatorReplacements()
)
): String =
Http4sMUnitDefaults.http4sMUnitNameCreator(
request,
followingRequests,
testOptions,
config,
http4sMUnitNameCreatorReplacements()
)

/** List of replacements that will be applied to the result of `http4sMUnitNameCreator` using `String#replaceAll` */
@deprecated(
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.1
sbt.version=1.10.7
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.16.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.12.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.13.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.4.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
Loading