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

chore(deps): Guardian library updates #98

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

gu-scala-steward-public-repos[bot]
Copy link
Contributor

About this PR

Updates:

Usage

βœ… Please merge!

I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.

If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a .scala-steward.conf file.

Have a fantastic day writing Scala!

πŸ” Files still referring to the old version numbers

The following files still refer to the old version numbers.
You might want to review and update them manually.

project/plugins.sbt
LEGACY_CHANGELOG.md
βš™ Adjust future updates

Add these to your .scala-steward.conf file to ignore future updates of these dependencies:

updates.ignore = [
  { groupId = "com.gu", artifactId = "content-api-models" },
  { groupId = "com.gu", artifactId = "content-api-models-scala" },
  { groupId = "com.gu", artifactId = "content-atom-model-thrift" },
  { groupId = "com.gu", artifactId = "content-entity-thrift" },
  { groupId = "com.gu", artifactId = "sbt-scrooge-typescript" }
]

Or, add these to slow down future updates of these dependencies:

dependencyOverrides = [
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "content-api-models" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "content-api-models-scala" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "content-atom-model-thrift" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "content-entity-thrift" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "sbt-scrooge-typescript" }
  }
]
labels: dependencies, library-update, sbt-plugin-update, early-semver-major, semver-spec-major, version-scheme:early-semver, old-version-remains, commit-count:n:4

@@ -1,6 +1,6 @@
addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.1.0")

addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "2.0.0")
addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "3.0.3")

Copy link
Contributor

@marjisound marjisound Jan 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently we can't update the sbt-scrooge-typescript to 3.0.3 because the scrooge version in this library https://github.com/guardian/scrooge-extras/blob/main/build.sbt#L15C5-L15C19 bans some key words like end which is used on content-api-model thrift. More details can be found here guardian/content-api-models#231 (comment)

The compilation error for this update is as followed:

Caused by: com.twitter.scrooge.frontend.FileParseException: Exception parsing: content/v1.thrift
[error] Caused by: com.twitter.scrooge.frontend.KeywordException: Identifier 'end' is invalid: it is a thrift keyword.

@@ -1,10 +1,10 @@
import ReleaseTransformations._
import sbtversionpolicy.withsbtrelease.ReleaseVersion

val contentEntityVersion = "3.0.3"
val contentAtomVersion = "4.0.4"
val contentEntityVersion = "4.0.0"
Copy link
Contributor

@marjisound marjisound Jan 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently we can't update com.gu:content-entity-thrift to 4.0.0 because com.gu:content-api-models-scala depends on 3.0.3.

[error] 	* com.gu:content-entity-thrift:4.0.0 (early-semver) is selected over 3.0.3
[error] 	    +- com.gu:apps-rendering-api-models_2.13:10.0.1-SNAPSHOT (depends on 4.0.0)
[error] 	    +- com.gu:content-api-models-scala_2.13:26.0.0        (depends on 3.0.3)

More details:
The conflict seems to come from libthrift because content-entity-thrift in version 3.0.3 is using libthrift v0.19.0 but content-entity-thrift in version 4.0.0 is using libthrift v0.20.0

Resolution: We'd need content-api-models-scala to update their libthrift to 0.20.0 which seems to be already happening as part of this PR https://github.com/guardian/content-api-models/pull/249/files

val contentEntityVersion = "3.0.3"
val contentAtomVersion = "4.0.4"
val contentEntityVersion = "4.0.0"
val contentAtomVersion = "6.0.0"
Copy link
Contributor

@marjisound marjisound Jan 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently we can't update com.gu:content-atom-model-thrift tp 6.0.0 because com.gu:content-api-models-scala depends on 4.0.4

[error] 	* com.gu:content-atom-model-thrift:6.0.0 (early-semver) is selected over 4.0.4
[error] 	    +- com.gu:apps-rendering-api-models_2.13:10.0.1-SNAPSHOT (depends on 6.0.0)
[error] 	    +- com.gu:content-api-models-scala_2.13:26.0.0        (depends on 4.0.4)

More details:
The conflict seems to come from libthrift because content-atom-model-thrift in version 4.0.4 is using libthrift v0.15.0 but content-atom-model-thrift in version 6.0.0 is using libthrift v0.20.0.

Resolution: We'd need content-api-models-scala to update their libthrift to 0.20.0 which seems to be already happening as part of this PR https://github.com/guardian/content-api-models/pull/249/files

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants