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.

Sign up for GitHub

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

Merged PRs 311, 310, 309, 308 #311

Merged
merged 8 commits into from
Jan 24, 2024
Merged

Merged PRs 311, 310, 309, 308 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a895d7
Update sbt-release to 1.4.0
tna-digital-archiving-jenkins Jan 24, 2024
fce1744
Update oauth2-oidc-sdk to 11.7.2
tna-digital-archiving-jenkins Jan 24, 2024
0eec95f
Update client3:circe, client3:core to 3.9.2
tna-digital-archiving-jenkins Jan 24, 2024
34fcc09
Update sbt to 1.9.8
tna-digital-archiving-jenkins Jan 24, 2024
ee60da7
Merge pull request #310 from nationalarchives/update/circe-3.9.2
annielh Jan 24, 2024
a5a9ccc
Merge pull request #309 from nationalarchives/update/oauth2-oidc-sdk-…
annielh Jan 24, 2024
60fbe84
Merge pull request #308 from nationalarchives/update/sbt-release-1.4.0
annielh Jan 24, 2024
e3cd78d
Merge branch 'master' into update/sbt-1.9.8
annielh Jan 24, 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
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt._
object Dependencies {
lazy val circeGenericExtrasVersion = "0.14.3"
lazy val circeVersion = "0.14.6"
lazy val sttpVersion = "3.9.1"
lazy val sttpVersion = "3.9.2"

lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.17"
lazy val wiremock = "com.github.tomakehurst" % "wiremock" % "3.0.1"
Expand All @@ -13,6 +13,6 @@ object Dependencies {
lazy val circeGenericExtras = "io.circe" %% "circe-generic-extras" % circeGenericExtrasVersion
lazy val sttp = "com.softwaremill.sttp.client3" %% "core" % sttpVersion
lazy val sttpCirce = "com.softwaremill.sttp.client3" %% "circe" % sttpVersion
lazy val oauth2 = "com.nimbusds" % "oauth2-oidc-sdk" % "11.7.1"
lazy val oauth2 = "com.nimbusds" % "oauth2-oidc-sdk" % "11.7.2"
lazy val sangria = "org.sangria-graphql" %% "sangria" % "4.0.2"
}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
resolvers += Resolver.jcenterRepo
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
Loading