Skip to content

Commit f9751f4

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #545 from permutive-engineering/update/all
Dependency Updates
2 parents c6f8221 + af72994 commit f9751f4

File tree

9 files changed

+56
-41
lines changed

9 files changed

+56
-41
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ jobs:
2525
name: Labeler
2626
runs-on: ubuntu-latest
2727
steps:
28+
- name: Checkout project
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
with:
31+
ref: ${{ github.head_ref }}
32+
repository: ${{ github.event.pull_request.head.repo.full_name }}
33+
fetch-depth: 0
34+
2835
- name: Update PR labels
2936
uses: alejandrohdezma/actions/labeler@v1
3037
if: github.event.pull_request.head.repo.full_name == github.repository
@@ -59,17 +66,20 @@ jobs:
5966
- 17
6067
steps:
6168
- name: Checkout project
62-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6370
with:
6471
ref: ${{ github.head_ref }}
6572
repository: ${{ github.event.pull_request.head.repo.full_name }}
6673
fetch-depth: 0
6774

68-
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
75+
- name: Run Coursier Cache Action
76+
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
77+
78+
- name: Run Coursier Setup Action
79+
uses: coursier/setup-action@039f736548afa5411c1382f40a5bd9c2d30e0383 # v1.3.9
6980
with:
70-
distribution: "liberica"
71-
java-version: ${{ matrix.jdk }}
72-
cache: "sbt"
81+
jvm: liberica:${{ matrix.jdk }}
82+
apps: sbt
7383

7484
- name: Run `sbt ci-test`
7585
run: sbt ci-test

‎.github/workflows/release.yml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,36 @@ on:
2323
tags: [v*]
2424
workflow_dispatch:
2525

26+
permissions:
27+
contents: write
28+
2629
jobs:
2730
release:
2831
name: Release a new version of the artifact
2932
runs-on: ubuntu-latest
3033
steps:
3134
- name: Checkout project
32-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3336
with:
3437
fetch-depth: 0
3538

3639
- name: Check latest tag follows semantic versioning
3740
if: github.event_name == 'push'
3841
uses: alejandrohdezma/actions/check-semver-tag@v1
3942

40-
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
43+
- name: Run Coursier Cache Action
44+
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
45+
46+
- name: Run Coursier Setup Action
47+
uses: coursier/setup-action@039f736548afa5411c1382f40a5bd9c2d30e0383 # v1.3.9
4148
with:
42-
distribution: "liberica"
43-
java-version: "11"
44-
cache: "sbt"
49+
jvm: liberica:17
50+
apps: sbt
4551

4652
- name: Run `sbt ci-publish`
4753
run: sbt ci-publish
4854
env:
49-
GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5056
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
5157
PGP_SECRET: ${{ secrets.PGP_SECRET }}
5258
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -59,22 +65,25 @@ jobs:
5965
runs-on: ubuntu-latest
6066
steps:
6167
- name: Checkout project
62-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
68+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6369
with:
6470
fetch-depth: 0
6571
ref: main
66-
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
72+
ssh-key: ${{ secrets.GIT_DEPLOY_KEY }}
73+
74+
- name: Run Coursier Cache Action
75+
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7
6776

68-
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
77+
- name: Run Coursier Setup Action
78+
uses: coursier/setup-action@039f736548afa5411c1382f40a5bd9c2d30e0383 # v1.3.9
6979
with:
70-
distribution: "liberica"
71-
java-version: "17"
72-
cache: "sbt"
80+
jvm: liberica:17
81+
apps: sbt
7382

7483
- name: Run `sbt ci-docs`
7584
run: sbt ci-docs
7685
env:
77-
GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
86+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7887
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
7988

8089
- name: Commit changes by `sbt ci-docs`
@@ -91,5 +100,3 @@ jobs:
91100
with:
92101
message: Reset `versionPolicyIntention` [skip ci]
93102
branch: main
94-
95-

‎build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ThisBuild / scalaVersion := "2.13.16"
2-
ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.6")
2+
ThisBuild / crossScalaVersions := Seq("2.13.16", "3.3.6")
33
ThisBuild / organization := "com.permutive"
4-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
4+
ThisBuild / versionPolicyIntention := Compatibility.None
55

66
addCommandAlias("ci-test", "fix --check; versionPolicyCheck; mdoc; publishLocal; +test")
77
addCommandAlias("ci-docs", "github; mdoc; headerCreateAll")

‎modules/fs2-pubsub/src/main/protobuf/google/package-opts.proto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ package google;
55
import "scalapb/scalapb.proto";
66

77
option (scalapb.options) = {
8-
scope: PACKAGE;
9-
package_name: "fs2.pubsub.grpc.internal";
10-
flat_package: true;
8+
scope: PACKAGE
9+
package_name: "fs2.pubsub.grpc.internal"
10+
flat_package: true
1111
aux_message_options: [
1212
{
13-
target: "*";
13+
target: "*"
1414
options: {
15-
annotations: "@scala.annotation.nowarn private[grpc]";
16-
companion_annotations: "@scala.annotation.nowarn private[grpc]";
15+
annotations: "@scala.annotation.nowarn"
16+
companion_annotations: "@scala.annotation.nowarn"
1717
}
1818
}
1919
]

‎modules/fs2-pubsub/src/main/scala/fs2/pubsub/PubSubClient.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ object PubSubClient extends GrpcConstructors.Client {
300300
}
301301

302302
// format: off
303-
type FromConfigBuilder[F[_]] =
303+
type FromConfigBuilder[F[_]] =
304304
ClientStep[F, RetryPolicyStep[F, PubSubClient[F]]]
305305
// format: on
306306

307307
// format: off
308-
type Builder[F[_]] =
308+
type Builder[F[_]] =
309309
ProjectIdStep[UriStep[ClientStep[F, RetryPolicyStep[F, PubSubClient[F]]]]]
310310
// format: on
311311

‎modules/fs2-pubsub/src/test/scala/fs2/pubsub/PubSubSuite.scala‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package fs2.pubsub
1818

19-
import scala.annotation.nowarn
2019
import scala.concurrent.duration._
2120
import scala.util.Properties
2221

@@ -40,7 +39,6 @@ import org.testcontainers.containers.wait.strategy.Wait
4039

4140
class PubSubSuite extends CatsEffectSuite {
4241

43-
@nowarn("msg=deprecated")
4442
val options =
4543
if (Properties.releaseVersion.orEmpty.startsWith("2.12"))
4644
List(("HTTP", PubSubClient.http[IO]))

‎project/Dependencies.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Dependencies {
88
ExclusionRule(organization = "com.thesamet.scalapb", name = "lenses_2.13"),
99
ExclusionRule(organization = "com.thesamet.scalapb", name = "scalapb-runtime_2.13")
1010
),
11-
"com.permutive" %% "gcp-auth" % "1.2.0",
11+
"com.permutive" %% "gcp-auth" % "2.0.1",
1212
"org.http4s" %% "http4s-ember-client" % "0.23.30"
1313
)
1414

@@ -17,29 +17,29 @@ object Dependencies {
1717
lazy val grpc = Seq(
1818
"com.google.api.grpc" % "proto-google-cloud-pubsub-v1" % "1.122.2",
1919
"com.google.api.grpc" % "proto-google-common-protos" % "2.59.1",
20-
"com.google.protobuf" % "protobuf-java" % "3.25.8"
20+
"com.google.protobuf" % "protobuf-java" % "4.31.1"
2121
).map(_ % "protobuf-src" intransitive ()) ++ Seq(
2222
"com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
2323
)
2424

2525
lazy val `fs2-pubsub` = Seq(
2626
"co.fs2" %% "fs2-core" % "3.12.0",
27-
"com.permutive" %% "common-types-gcp-http4s" % "1.1.0",
27+
"com.permutive" %% "common-types-gcp-http4s" % "1.2.0",
2828
"io.circe" %% "circe-parser" % "0.14.14",
2929
"org.http4s" %% "http4s-circe" % "0.23.30",
3030
"org.http4s" %% "http4s-client" % "0.23.30",
3131
"org.http4s" %% "http4s-dsl" % "0.23.30"
3232
) ++ Seq(
33-
"com.dimafeng" %% "testcontainers-scala-munit" % "0.41.8",
34-
"com.permutive" %% "gcp-auth" % "1.2.0",
33+
"com.dimafeng" %% "testcontainers-scala-munit" % "0.43.0",
34+
"com.permutive" %% "gcp-auth" % "2.0.1",
3535
"org.http4s" %% "http4s-ember-client" % "0.23.30",
3636
"org.slf4j" % "slf4j-nop" % "2.0.17",
3737
"org.typelevel" %% "munit-cats-effect" % "2.1.0"
3838
).map(_ % Test)
3939

4040
lazy val `fs2-pubsub-pureconfig` = Seq(
41-
"com.github.pureconfig" %% "pureconfig-http4s" % "0.17.7",
42-
"com.permutive" %% "common-types-gcp-pureconfig" % "1.1.0"
41+
"com.github.pureconfig" %% "pureconfig-http4s" % "0.17.9",
42+
"com.permutive" %% "common-types-gcp-pureconfig" % "1.2.0"
4343
)
4444

4545
}

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.11
1+
sbt.version=1.11.3

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")
2-
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1")
2+
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.19.0")
33
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.2")
44
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.12.0")
55
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0")

0 commit comments

Comments
 (0)