Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: guardian/play-googleauth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v20.0.0
Choose a base ref
...
head repository: guardian/play-googleauth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 13 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 30, 2025

  1. Post-release of v20.0.0 by @Divs-B: set snapshot version 

    Setting snapshot version after @Divs-B published https://github.com/guardian/play-googleauth/releases/tag/v20.0.0
    @gu-scala-library-release
    gu-scala-library-release[bot] authored Jan 30, 2025
    Loading
    Loading status checks…

    Unverified

    This user has not yet uploaded their public signing key.
    Learn about vigilant mode
    Copy the full SHA
    fbea7d5 View commit details

  2. Update commons-codec to 1.18.0

    @gu-scala-steward-public-repos
    gu-scala-steward-public-repos[bot] committed Jan 30, 2025

    Unverified

    This user has not yet uploaded their public signing key.
    Learn about vigilant mode
    Copy the full SHA
    37f24e6 View commit details

  3. Update scala3-library to 3.3.5

    @gu-scala-steward-public-repos
    gu-scala-steward-public-repos[bot] committed Jan 30, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    64334ba View commit details

Commits on Feb 3, 2025

  1. Update ssm to 2.29.52

    @gu-scala-steward-public-repos
    gu-scala-steward-public-repos[bot] committed Feb 3, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    762ddb0 View commit details

Commits on Feb 14, 2025

  1. Merge pull request #283 from guardian/update/aws 

    chore(deps): AWS dependency updates
    @Divs-B
    Divs-B authored Feb 14, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    8778c9c View commit details

  2. Merge pull request #282 from guardian/update/non_aws 

    chore(deps): Non-AWS dependency updates
    @Divs-B
    Divs-B authored Feb 14, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    a6890da View commit details

  3. v20.1.0 published by Divs-B 

    Divs-B published release version 20.1.0
using gha-scala-library-release-workflow: https://github.com/guardian/gha-scala-library-release-workflow

Release-Version: 20.1.0
Release-Initiated-By: https://github.com/Divs-B
Release-Workflow-Run: https://github.com/guardian/play-googleauth/actions/runs/13328906423
GitHub-Release-Notes: https://github.com/guardian/play-googleauth/releases/tag/v20.1.0
    @gu-scala-library-release
    gu-scala-library-release[bot] authored Feb 14, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    5d38e70 View commit details

  4. Post-release of v20.1.0 by @Divs-B: set snapshot version 

    Setting snapshot version after @Divs-B published https://github.com/guardian/play-googleauth/releases/tag/v20.1.0
    @gu-scala-library-release
    gu-scala-library-release[bot] authored Feb 14, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    ea25556 View commit details

Commits on Feb 17, 2025

  1. Update google-auth-library-oauth2-http to 1.32.1

    @gu-scala-steward-public-repos
    gu-scala-steward-public-repos[bot] committed Feb 17, 2025
    Copy the full SHA
    abda47d View commit details

  2. Update play-secret-rotation:core to 13.2.0

    @gu-scala-steward-public-repos
    gu-scala-steward-public-repos[bot] committed Feb 17, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    3243467 View commit details

Commits on Feb 28, 2025

  1. Merge pull request #284 from guardian/update/non_aws 

    chore(deps): Non-AWS dependency updates
    @Divs-B
    Divs-B authored Feb 28, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    c0bee86 View commit details

  2. v20.2.0 published by Divs-B 

    Divs-B published release version 20.2.0
using gha-scala-library-release-workflow: https://github.com/guardian/gha-scala-library-release-workflow

Release-Version: 20.2.0
Release-Initiated-By: https://github.com/Divs-B
Release-Workflow-Run: https://github.com/guardian/play-googleauth/actions/runs/13588589161
GitHub-Release-Notes: https://github.com/guardian/play-googleauth/releases/tag/v20.2.0
    @gu-scala-library-release
    gu-scala-library-release[bot] authored Feb 28, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    221c942 View commit details

  3. Post-release of v20.2.0 by @Divs-B: set snapshot version 

    Setting snapshot version after @Divs-B published https://github.com/guardian/play-googleauth/releases/tag/v20.2.0
    @gu-scala-library-release
    gu-scala-library-release[bot] authored Feb 28, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    fbd7043 View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 build.sbt
  2. +2 −2 project/Dependencies.scala
  3. +1 −1 version.sbt
6 changes: 3 additions & 3 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -15,16 +15,16 @@ val artifactPomMetadataSettings = Seq(

def projectWithPlayVersion(playVersion: PlayVersion) =
Project(playVersion.projectId, file(playVersion.projectId)).settings(
crossScalaVersions := Seq(scalaVersion.value, "3.3.4"),
crossScalaVersions := Seq(scalaVersion.value, "3.3.5"),
scalacOptions ++= Seq("-feature", "-deprecation", "-release","11"),
Compile / unmanagedSourceDirectories += baseDirectory.value / playVersion.pekkoOrAkkaSrcFolder,

libraryDependencies ++= Seq(
"com.gu.play-secret-rotation" %% "core" % "13.1.2",
"com.gu.play-secret-rotation" %% "core" % "13.2.0",
"org.typelevel" %% "cats-core" % "2.13.0",
commonsCodec,
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"software.amazon.awssdk" % "ssm" % "2.29.44" % Test
"software.amazon.awssdk" % "ssm" % "2.29.52" % Test
) ++ googleDirectoryAPI ++ playVersion.playLibs,

artifactPomMetadataSettings
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ object Dependencies {
val V30 = PlayVersion("30", "org.playframework", "3.0.6", usesPekko = true)
}

val commonsCodec = "commons-codec" % "commons-codec" % "1.17.2"
val commonsCodec = "commons-codec" % "commons-codec" % "1.18.0"

/** The google-api-services-admin-directory artifact has a transitive dependency on com.google.guava:guava-jdk5 - a
* nasty artifact that clashes with the regular com.google.guava:guava artifact, providing two versions of the same
@@ -46,7 +46,7 @@ object Dependencies {
val googleDirectoryAPI = Seq(
"com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev20241210-2.0.0",
"com.google.api-client" % "google-api-client" % "2.7.2",
"com.google.auth" % "google-auth-library-oauth2-http" % "1.31.0"
"com.google.auth" % "google-auth-library-oauth2-http" % "1.32.1"
).map(_ exclude("com.google.guava", "guava-jdk5")) :+ "com.google.guava" % "guava" % "33.4.0-jre"

}
2 changes: 1 addition & 1 deletion version.sbt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "20.0.0"
ThisBuild / version := "20.2.1-SNAPSHOT"