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

chore(deps): Guardian library updates #98

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

chore(deps): Guardian library updates #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3104a71
Update content-atom-model-thrift to 6.0.0
gu-scala-steward-public-repos[bot] Nov 18, 2024
8da5234
Update content-entity-thrift to 4.0.0
gu-scala-steward-public-repos[bot] Nov 18, 2024
b937899
Update sbt-scrooge-typescript to 3.0.3
gu-scala-steward-public-repos[bot] Nov 18, 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 build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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 •
edited
Loading

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 contentAtomVersion = "6.0.0"
Copy link
Contributor

@marjisound marjisound Jan 14, 2025 •
edited
Loading

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

val storyPackageVersion = "2.2.0"
val contentApiModelsVersion = "26.0.0"

Expand Down
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,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 •
edited
Loading

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.

addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")

Expand Down
Loading