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

Merged
merged 23 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1e5ac3e
Update sbt-scalafix to 0.13.0
permutive-steward[bot] Nov 1, 2024
b092b34
Update http4s-munit to 1.1.0
permutive-steward[bot] Nov 1, 2024
41196fd
Update sbt-ci to 2.15.1
permutive-steward[bot] Nov 1, 2024
b54ed18
Run `sbt generateCiFiles`
permutive-steward[bot] Nov 1, 2024
75d8338
Update sbt-fix to 0.7.2
permutive-steward[bot] Nov 1, 2024
0d7986d
Update sbt-github-header to 0.12.0
permutive-steward[bot] Nov 1, 2024
db7e48e
Update sbt-github-mdoc to 0.12.0
permutive-steward[bot] Nov 1, 2024
55e4142
Update sbt-mdoc-toc to 0.4.2
permutive-steward[bot] Nov 1, 2024
c36cbe4
Update sbt-modules to 0.3.2
permutive-steward[bot] Nov 1, 2024
2e7fdfa
Update sbt-scalafix-defaults to 0.13.1
permutive-steward[bot] Nov 1, 2024
a894ee9
Run `sbt fix`
permutive-steward[bot] Nov 1, 2024
d527daa
Update sbt-scalafmt-defaults to 0.9.1
permutive-steward[bot] Nov 1, 2024
8573c72
Update sbt-ci-release to 1.9.0
permutive-steward[bot] Nov 1, 2024
d4c6071
Update http4s-circe to 0.23.29
permutive-steward[bot] Nov 1, 2024
fc208e1
Update http4s-client to 0.23.29
permutive-steward[bot] Nov 1, 2024
5b45ecf
Update scala-library to 2.12.20
permutive-steward[bot] Nov 1, 2024
8bf37c2
Update scala-library to 2.13.15
permutive-steward[bot] Nov 1, 2024
a59d9e6
Update scala3-library to 3.3.4
permutive-steward[bot] Nov 1, 2024
09ed38b
Update sbt to 1.10.4
permutive-steward[bot] Nov 1, 2024
050ad23
Update sbt-mdoc to 2.6.1
permutive-steward[bot] Nov 1, 2024
e89be64
Update sbt-tpolecat to 0.5.2
permutive-steward[bot] Nov 1, 2024
ec6c275
Merge branch 'main' into update/all
alejandrohdezma Nov 6, 2024
f64d997
Fix compilation
alejandrohdezma Nov 6, 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
12 changes: 6 additions & 6 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.BinaryCompatible

Expand All @@ -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`)
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,18 @@ 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())))
}(userHome => IO(sys.props.put("user.home", userHome)).void)
}

}

final case class Config(tokenType: TokenType)

object Config {

implicit val ConfigConfigReader: ConfigReader[Config] = ConfigReader.forProduct1("token-type")(Config.apply)

}
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")