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

Merged
merged 6 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / scalaVersion := "2.13.14"
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.3")
ThisBuild / organization := "com.permutive"
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible

addCommandAlias("ci-test", "fix --check; versionPolicyCheck; mdoc; publishLocal; +test")
addCommandAlias("ci-docs", "github; mdoc; headerCreateAll")
Expand All @@ -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" % "0.15.1" % Test)
.settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.0.0" % Test)
.settings(Test / fork := true)

lazy val `gcp-auth-pureconfig` = module
.settings(libraryDependencies += "com.github.pureconfig" %% "pureconfig-core" % "0.17.6")
.settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "0.15.1" % Test)
.settings(libraryDependencies += "com.github.pureconfig" %% "pureconfig-core" % "0.17.7")
.settings(libraryDependencies += "com.alejandrohdezma" %% "http4s-munit" % "1.0.0" % Test)
.settings(Test / fork := true)
.dependsOn(`gcp-auth`)
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ import com.permutive.gcp.auth.models.ExpiresIn
import com.permutive.gcp.auth.models.Token
import io.circe.Json
import io.circe.syntax._
import munit.ClientSuite
import munit.CatsEffectSuite
import munit.Http4sMUnitSyntax
import org.http4s.HttpApp
import org.http4s.circe._
import org.http4s.client.Client
import pureconfig.ConfigReader
import pureconfig.ConfigSource

class TypeTokenSuite extends ClientSuite {
class TypeTokenSuite extends CatsEffectSuite with Http4sMUnitSyntax {

fixture("/").test {
"TokenType.UserAccount can be loaded from configuration"
Expand Down Expand Up @@ -86,7 +87,7 @@ class TypeTokenSuite extends ClientSuite {

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

def fixture(resource: String) = ResourceFixture {
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class ParserSuite extends CatsEffectSuite {
// Parser.applicationDefaultCredentials //
//////////////////////////////////////////

def fixture(resource: String) = ResourceFixture {
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ import com.permutive.gcp.auth.models.Token
import fs2.Stream
import io.circe.Json
import io.circe.syntax._
import munit.ClientSuite
import munit.CatsEffectSuite
import munit.Http4sMUnitSyntax
import org.http4s.HttpApp
import org.http4s.Request
import org.http4s.circe._
import org.http4s.client.Client
import org.http4s.syntax.all._
import org.typelevel.ci._
import pdi.jwt.JwtCirce
import pdi.jwt.JwtClaim

class TokenProviderSuite extends ClientSuite {
class TokenProviderSuite extends CatsEffectSuite with Http4sMUnitSyntax {

/////////////////////////
// TokenProvider.const //
Expand Down Expand Up @@ -230,7 +230,7 @@ class TokenProviderSuite extends ClientSuite {
// TokenProvider.userAccount(Client) //
///////////////////////////////////////

def fixture(resource: String) = ResourceFixture {
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)
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.0
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")