Skip to content
This repository was archived by the owner on Feb 5, 2026. It is now read-only.

chore(deps): Guardian library updates#98

Closed
gu-scala-steward-public-repos[bot] wants to merge 1 commit intomainfrom
update/gu
Closed

chore(deps): Guardian library updates#98
gu-scala-steward-public-repos[bot] wants to merge 1 commit intomainfrom
update/gu

Conversation

@gu-scala-steward-public-repos
Copy link
Contributor

@gu-scala-steward-public-repos gu-scala-steward-public-repos bot commented Nov 18, 2024

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!

⚙ 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-entity-thrift" }
]

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

dependencyOverrides = [
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.gu", artifactId = "content-entity-thrift" }
  }
]
labels: dependencies


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.


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

build.sbt Outdated
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

@shesah
Copy link

shesah commented Jun 3, 2025

We are hoping to get rid of AR soon, at which point this this doesn't become an issue, however if there is any security implications in the future we can revisit

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants