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 #53

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9c733be
Update sbt-scalafix to 0.13.0
permutive-steward[bot] Nov 1, 2024
2eeb3c1
Update logback-classic to 1.2.13
permutive-steward[bot] Nov 1, 2024
a2c604c
Update sbt-ci to 2.15.1
permutive-steward[bot] Nov 1, 2024
cafcdd9
Run `sbt generateCiFiles`
permutive-steward[bot] Nov 1, 2024
cd9d417
Update sbt-fix to 0.7.2
permutive-steward[bot] Nov 1, 2024
7cae676
Update sbt-github-header to 0.12.0
permutive-steward[bot] Nov 1, 2024
8fe3592
Update sbt-github-mdoc to 0.12.0
permutive-steward[bot] Nov 1, 2024
c7a2b79
Update sbt-mdoc-toc to 0.4.2
permutive-steward[bot] Nov 1, 2024
3f30e33
Update sbt-modules to 0.3.2
permutive-steward[bot] Nov 1, 2024
0026d2e
Update sbt-scalafix-defaults to 0.13.1
permutive-steward[bot] Nov 1, 2024
5188aaf
Update sbt-scalafmt-defaults to 0.9.1
permutive-steward[bot] Nov 1, 2024
8b54d6c
Run `sbt fix`
permutive-steward[bot] Nov 1, 2024
2b68509
Update sbt-ci-release to 1.9.0
permutive-steward[bot] Nov 1, 2024
e1c1948
Update google-cloud-bigtable to 2.46.0
permutive-steward[bot] Nov 1, 2024
3a08858
Update google-cloud-bigtable-emulator to 0.183.0
permutive-steward[bot] Nov 1, 2024
443c1df
Update scala-library to 2.12.20
permutive-steward[bot] Nov 1, 2024
4bbadca
Update scala-library to 2.13.15
permutive-steward[bot] Nov 1, 2024
388270d
Update scala3-library to 3.3.4
permutive-steward[bot] Nov 1, 2024
6fdfd63
Update sbt to 1.10.4
permutive-steward[bot] Nov 1, 2024
00ecf66
Update munit to 1.0.2
permutive-steward[bot] Nov 1, 2024
605ae14
Update sbt-mdoc to 2.6.1
permutive-steward[bot] Nov 1, 2024
33cee4f
Update cats-effect to 3.5.5
permutive-steward[bot] Nov 1, 2024
dbe1e80
Update cats-effect-testkit to 3.5.5
permutive-steward[bot] Nov 1, 2024
d7a25eb
Update sbt-tpolecat to 0.5.2
permutive-steward[bot] Nov 1, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ jobs:
- 17
steps:
- name: Checkout project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
ref: ${{ github.head_ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
fetch-depth: 0

- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: ${{ matrix.jdk }}
Expand Down
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
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@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: "11"
Expand All @@ -59,13 +59,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
ref: main
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: "17"
Expand Down
4 changes: 2 additions & 2 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 / organization := "com.permutive"
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,7 @@ object CatsEffectMBeans {
Right((MetricCollection.empty, 0, 0))
)(
readAttributes(
mbs,
_,
MetricCollection.empty,
"compute_pool",
nameMap,
Map.empty
mbs, _, MetricCollection.empty, "compute_pool", nameMap, Map.empty
)
)
cpuStarvationRes <- cpuStarvation
Expand All @@ -171,12 +166,7 @@ object CatsEffectMBeans {
val (col, parseErrors, errors) = computePoolRes

readAttributes(
mbs,
cpuStarvationMBean,
col,
"cpu_starvation",
nameMap,
Map.empty
mbs, cpuStarvationMBean, col, "cpu_starvation", nameMap, Map.empty
).map { case (c, pe, e) =>
(c, parseErrors + pe, errors + e)
}
Expand Down
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {

lazy val `prometheus4cats-contrib-cats-effect` = Seq(
"com.permutive" %% "prometheus4cats" % "3.0.0",
"org.typelevel" %% "cats-effect" % "3.5.4"
"org.typelevel" %% "cats-effect" % "3.5.5"
)

lazy val `prometheus4cats-contrib-trace4cats` = Seq(
Expand All @@ -22,12 +22,12 @@ object Dependencies {
)

lazy val `prometheus4cats-contrib-google-cloud-bigtable` = Seq(
"com.google.cloud" % "google-cloud-bigtable" % "2.42.0",
"com.google.cloud" % "google-cloud-bigtable" % "2.46.0",
"com.permutive" %% "prometheus4cats" % "3.0.0"
) ++ Seq(
"com.google.cloud" % "google-cloud-bigtable-emulator" % "0.179.0",
"org.scalameta" %% "munit" % "1.0.1",
"org.typelevel" %% "cats-effect-testkit" % "3.5.4",
"com.google.cloud" % "google-cloud-bigtable-emulator" % "0.183.0",
"org.scalameta" %% "munit" % "1.0.2",
"org.typelevel" %% "cats-effect-testkit" % "3.5.5",
"org.typelevel" %% "munit-cats-effect" % "2.0.0"
).map(_ % Test)

Expand All @@ -40,11 +40,11 @@ object Dependencies {
"com.github.fd4s" %% "fs2-kafka" % "3.5.1",
"com.permutive" %% "prometheus4cats" % "3.0.0"
) ++ Seq(
"ch.qos.logback" % "logback-classic" % "1.2.11", // scala-steward:of,
"ch.qos.logback" % "logback-classic" % "1.2.13", // scala-steward:of,
"com.dimafeng" %% "testcontainers-scala-kafka" % "0.41.4",
"com.dimafeng" %% "testcontainers-scala-munit" % "0.41.4",
"com.permutive" %% "prometheus4cats-java" % "3.0.0",
"org.typelevel" %% "cats-effect-testkit" % "3.5.4",
"org.typelevel" %% "cats-effect-testkit" % "3.5.5",
"org.typelevel" %% "log4cats-slf4j" % "2.7.0",
"org.typelevel" %% "munit-cats-effect" % "2.0.0"
).map(_ % Test)
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.4
24 changes: 12 additions & 12 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.13.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.4.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1")
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-mdoc-toc" % "0.4.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.2")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
Loading