From 72f128bd2040a7c205437cc3c91f132c259b4572 Mon Sep 17 00:00:00 2001 From: Simon Byford Date: Mon, 20 Oct 2025 14:55:11 +0100 Subject: [PATCH 1/3] Bump `content-atom-model-thrift` --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index caf745b..163086f 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions val contentEntityVersion = "3.0.3" -val contentAtomVersion = "6.1.0" +val contentAtomVersion = "7.0.0-PREVIEW.rjr-new-looping-video-boolean-field.2025-09-18T1031.6d43b19f" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes From ee0334f94dd677cdf4a05b6aab2c78632e165714 Mon Sep 17 00:00:00 2001 From: Simon Byford Date: Tue, 28 Oct 2025 16:23:45 +0000 Subject: [PATCH 2/3] Use version 7.0.7 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 163086f..ffe7ea0 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions val contentEntityVersion = "3.0.3" -val contentAtomVersion = "7.0.0-PREVIEW.rjr-new-looping-video-boolean-field.2025-09-18T1031.6d43b19f" +val contentAtomVersion = "7.0.7" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes From 547402c25013e14c94d5c38a8ad03cac4c308371 Mon Sep 17 00:00:00 2001 From: Simon Byford Date: Wed, 29 Oct 2025 10:52:50 +0000 Subject: [PATCH 3/3] Add encoders and decoders --- json/src/main/scala/com/gu/contentapi/json/CirceDecoders.scala | 1 + json/src/main/scala/com/gu/contentapi/json/CirceEncoders.scala | 1 + 2 files changed, 2 insertions(+) diff --git a/json/src/main/scala/com/gu/contentapi/json/CirceDecoders.scala b/json/src/main/scala/com/gu/contentapi/json/CirceDecoders.scala index d8f0395..7737248 100644 --- a/json/src/main/scala/com/gu/contentapi/json/CirceDecoders.scala +++ b/json/src/main/scala/com/gu/contentapi/json/CirceDecoders.scala @@ -166,6 +166,7 @@ object CirceDecoders { implicit val imageAssetDimensionsDecoder: Decoder[contentatom.ImageAssetDimensions] = deriveDecoder implicit val mediaAssetDecoder: Decoder[media.Asset] = deriveDecoder implicit val mediaMetadataDecoder: Decoder[media.Metadata] = deriveDecoder + implicit val mediaSelfHostDataDecoder: Decoder[media.SelfHostData] = deriveDecoder implicit val mediaPlutoDataDecoder: Decoder[media.PlutoData] = deriveDecoder implicit val mediaYoutubeDataDecoder: Decoder[media.YoutubeData] = deriveDecoder implicit val explainerAtomDecoder: Decoder[explainer.ExplainerAtom] = deriveDecoder diff --git a/json/src/main/scala/com/gu/contentapi/json/CirceEncoders.scala b/json/src/main/scala/com/gu/contentapi/json/CirceEncoders.scala index 03e646c..8e695ba 100644 --- a/json/src/main/scala/com/gu/contentapi/json/CirceEncoders.scala +++ b/json/src/main/scala/com/gu/contentapi/json/CirceEncoders.scala @@ -115,6 +115,7 @@ object CirceEncoders { implicit val imageAssetDimensionsEncoder: Encoder[contentatom.ImageAssetDimensions] = deriveEncoder implicit val mediaAssetEncoder: Encoder[media.Asset] = deriveEncoder implicit val mediaMetadataEncoder: Encoder[media.Metadata] = deriveEncoder + implicit val mediaSelfHostDataEncoder: Encoder[media.SelfHostData] = deriveEncoder implicit val mediaPlutoDataEncoder: Encoder[media.PlutoData] = deriveEncoder implicit val mediaYoutubeDataEncoder: Encoder[media.YoutubeData] = deriveEncoder implicit val explainerAtomEncoder: Encoder[explainer.ExplainerAtom] = deriveEncoder