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" diff --git a/build.sbt b/build.sbt index 0c4309a..d8be945 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 / scalaVersion := "2.13.15" +ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.4") ThisBuild / organization := "com.permutive" ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible @@ -15,13 +15,13 @@ 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-circe" % "0.23.27") - .settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.0.0" % Test) + .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) 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`) 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..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) } - 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) + +} 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index f9416e4..d851b67 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")