From 1e5ac3ed20bfdc9adcec8b77b9ece3a6cbf3f6e5 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:24 +0000 Subject: [PATCH 01/22] Update sbt-scalafix to 0.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f9416e4..f25373b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") 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") From b092b34554174df33f59dcbfd4ea0e5b83a6b455 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:25 +0000 Subject: [PATCH 02/22] Update http4s-munit to 1.1.0 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0478f3b..86fe710 100644 --- a/build.sbt +++ b/build.sbt @@ -17,11 +17,11 @@ lazy val `gcp-auth` = module .settings(libraryDependencies += "com.permutive" %% "refreshable" % "2.0.0") .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.27") .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.27") - .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.0.0" % Test) + .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.1.0" % Test) .settings(Test / fork := true) lazy val `gcp-auth-pureconfig` = module .settings(libraryDependencies += "com.github.pureconfig" %% "pureconfig-core" % "0.17.7") - .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.0.0" % Test) + .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.1.0" % Test) .settings(Test / fork := true) .dependsOn(`gcp-auth`) From 41196fdb1751624ecabef610bbf9d725c495555e Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:25 +0000 Subject: [PATCH 03/22] Update sbt-ci to 2.15.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f25373b..44393ff 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") -addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1") 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") From b54ed18b491dc41469862159295d814b439dc7d1 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 04/22] Run `sbt generateCiFiles` Executed command: sbt generateCiFiles --- .github/workflows/ci.yml | 5 +++-- .github/workflows/release.yml | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1dcd0d..e47a1cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 444c661..87f08e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ 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 @@ -37,7 +37,7 @@ jobs: 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" @@ -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" From 75d8338466440349d6e1e6723b7c338e1f5ad2f8 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 05/22] Update sbt-fix to 0.7.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 44393ff..744dd80 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1") -addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1") +addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.2") 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") From 0d7986d50c5bae00d5c891924ccba3b592c3f6c0 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 06/22] Update sbt-github-header to 0.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 744dd80..efeddcc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0. addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1") addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.2") addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13") -addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0") 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") From db7e48e4e1248b45118ddadb2729c0c974dea98a Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 07/22] Update sbt-github-mdoc to 0.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index efeddcc..57232e2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ 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.11.13") +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.0") addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0") From 55e4142e89858cc9e91a818b8b0bac57f1d460ee Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 08/22] Update sbt-mdoc-toc to 0.4.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 57232e2..06e6e6c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0. addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0") 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-mdoc-toc" % "0.4.2") addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.1") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") From c36cbe4cee7f57d142407a6361c4e2407e9da1ad Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 09/22] Update sbt-modules to 0.3.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 06e6e6c..07e595f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0. 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.2") -addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.1") +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("de.heikoseeberger" % "sbt-header" % "5.10.0") From 2e7fdfabab1c97441e4232f73ef0c13175f1cd53 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:02:39 +0000 Subject: [PATCH 10/22] Update sbt-scalafix-defaults to 0.13.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 07e595f..ba317aa 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2. 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.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.13.1") addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0") addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.4.2") addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.2") From a894ee97c0b84145730cfcabbcbfabe7afc05926 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:16 +0000 Subject: [PATCH 11/22] Run `sbt fix` Executed command: sbt fix --- .../com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala b/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala index 2ffb324..a1c1da3 100644 --- a/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala +++ b/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala @@ -83,7 +83,7 @@ class TypeTokenSuite extends CatsEffectSuite with Http4sMUnitSyntax { assertIO(result, AccessToken.noop) } - case class Config(tokenType: TokenType) + final case class Config(tokenType: TokenType) implicit val ConfigConfigReader: ConfigReader[Config] = ConfigReader.forProduct1("token-type")(Config.apply) From d527daaa1e79849aea5071f540ab2ad0087a3fc6 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:16 +0000 Subject: [PATCH 12/22] Update sbt-scalafmt-defaults to 0.9.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ba317aa..cbfe053 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0. 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.0") +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") From 8573c72d2ff4fb36c7bcc46562c0bdb1fdc1744c Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 13/22] Update sbt-ci-release to 1.9.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cbfe053..7448094 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0. 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") From d4c60719215750b018484bc54e53850f6d0fc975 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 14/22] Update http4s-circe to 0.23.29 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 86fe710..5dcbaa6 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ lazy val `gcp-auth` = module .settings(libraryDependencies += "com.github.jwt-scala" %% "jwt-circe" % "10.0.1") .settings(libraryDependencies += "com.permutive" %% "refreshable" % "2.0.0") .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.27") - .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.27") + .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.29") .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.1.0" % Test) .settings(Test / fork := true) From fc208e13aac1e55b6ba1091539f9935af07a44c4 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 15/22] Update http4s-client to 0.23.29 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5dcbaa6..a1b3f20 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ lazy val `gcp-auth` = module .settings(libraryDependencies += "com.auth0" % "java-jwt" % "4.4.0") .settings(libraryDependencies += "com.github.jwt-scala" %% "jwt-circe" % "10.0.1") .settings(libraryDependencies += "com.permutive" %% "refreshable" % "2.0.0") - .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.27") + .settings(libraryDependencies += "org.http4s" %% "http4s-client" % "0.23.29") .settings(libraryDependencies += "org.http4s" %% "http4s-circe" % "0.23.29") .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.1.0" % Test) .settings(Test / fork := true) From 5b45ecf34d072548e56210bde5b2117470271b9f Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 16/22] Update scala-library to 2.12.20 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a1b3f20..ee585aa 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ ThisBuild / scalaVersion := "2.13.14" -ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.3") +ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.14", "3.3.3") ThisBuild / organization := "com.permutive" ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible From 8bf37c26ef48a0aefe6410d9df3c514ec19fe4de Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 17/22] Update scala-library to 2.13.15 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index ee585aa..0a9150d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -ThisBuild / scalaVersion := "2.13.14" -ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.14", "3.3.3") +ThisBuild / scalaVersion := "2.13.15" +ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.3") ThisBuild / organization := "com.permutive" ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible From a59d9e6913c8eef1d04a2b3c215a7f6d8c2057ee Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 18/22] Update scala3-library to 3.3.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0a9150d..59b59f3 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ ThisBuild / scalaVersion := "2.13.15" -ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.3") +ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.4") ThisBuild / organization := "com.permutive" ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible From 09ed38bddaddea1d44f1428b6abb1a8ec95c6473 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 19/22] Update sbt to 1.10.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index cb409aa..c068508 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 \ No newline at end of file +sbt.version=1.10.4 \ No newline at end of file From 050ad23b2bc1b92c0fa95644793c47da2069a027 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 20/22] Update sbt-mdoc to 2.6.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7448094..8bb51a0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,5 +12,5 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1. 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.scalameta" % "sbt-mdoc" % "2.6.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From e89be64b1e46c883907c53187574b51f3ecb8b17 Mon Sep 17 00:00:00 2001 From: "permutive-steward[bot]" <155995252+permutive-steward[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 05:03:43 +0000 Subject: [PATCH 21/22] Update sbt-tpolecat to 0.5.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8bb51a0..d851b67 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,6 +11,6 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3. 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.typelevel" % "sbt-tpolecat" % "0.5.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From f64d9970e3a00c559ea95d4d92209a6d50f38ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Wed, 6 Nov 2024 19:47:20 +0100 Subject: [PATCH 22/22] Fix compilation --- .../gcp/auth/pureconfig/TypeTokenSuite.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala b/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala index a1c1da3..e9aad2d 100644 --- a/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala +++ b/modules/gcp-auth-pureconfig/src/test/scala/com/permutive/gcp/auth/pureconfig/TypeTokenSuite.scala @@ -83,10 +83,6 @@ class TypeTokenSuite extends CatsEffectSuite with Http4sMUnitSyntax { assertIO(result, AccessToken.noop) } - final case class Config(tokenType: TokenType) - - implicit val ConfigConfigReader: ConfigReader[Config] = ConfigReader.forProduct1("token-type")(Config.apply) - def fixture(resource: String) = ResourceFunFixture { Resource.make { IO(sys.props("user.home")).flatTap(_ => IO(sys.props.put("user.home", getClass.getResource(resource).getPath()))) @@ -94,3 +90,11 @@ class TypeTokenSuite extends CatsEffectSuite with Http4sMUnitSyntax { } } + +final case class Config(tokenType: TokenType) + +object Config { + + implicit val ConfigConfigReader: ConfigReader[Config] = ConfigReader.forProduct1("token-type")(Config.apply) + +}