Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

// dependency versions
val contentEntityVersion = "4.0.0"
val contentAtomVersion = "12.0.1"
val contentAtomVersion = "13.1.0-PREVIEW.glspike-multimedia-atom.2026-08-03T1406.314057f2"
val storyPackageVersion = "2.2.0"
val thriftVersion = "0.24.0"
val scroogeVersion = "22.1.0" // update plugins too if this version changes
Expand All @@ -25,6 +25,11 @@

lazy val artifactProductionSettings = Seq(
scalaVersion := "2.13.14",
// A newer scala-library (2.13.18) is pulled in transitively via content-atom, but the 2.13.18
// compiler crashes on the fezziwig/circe macro-generated trees (scala.MatchError in RefChecks'
// isSimpleCaseApply). We stay on the 2.13.14 compiler, which compiles cleanly, and demote the
// SIP-51 check since all 2.13.x are binary compatible.
allowUnsafeScalaLibUpgrade := true,
// This old attempt to downgrade scrooge reserved word clashes is now insufficient... https://github.com/twitter/scrooge/issues/259#issuecomment-1900743695
Compile / scroogeDisableStrict := true,
// scrooge 21.3.0: Builds are now only supported for Scala 2.12+
Expand All @@ -33,7 +38,7 @@
organization := "com.gu",
licenses := Seq("Apache v2" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),
scmInfo := Some(ScmInfo(url("https://github.com/guardian/content-api-models"), "scm:git@github.com:guardian/content-api-models.git")),
resolvers ++= Resolver.sonatypeOssRepos("public"),

Check warning on line 41 in build.sbt

View workflow job for this annotation

GitHub Actions / Maven Release / 🎊 Versioning

method sonatypeOssRepos in class ResolverFunctions is deprecated (since 1.11.2): Sonatype OSS Repository Hosting (OSSRH) was sunset on 2025-06-30; remove this resolver. If snapshots are required, use:

Check warning on line 41 in build.sbt

View workflow job for this annotation

GitHub Actions / Maven Release / 🎊 Create artifacts

method sonatypeOssRepos in class ResolverFunctions is deprecated (since 1.11.2): Sonatype OSS Repository Hosting (OSSRH) was sunset on 2025-06-30; remove this resolver. If snapshots are required, use:
Test / testOptions +=
Tests.Argument(TestFrameworks.ScalaTest, "-u", s"test-results/scala-${scalaVersion.value}", "-o")
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ object CirceDecoders {
implicit val audioAtomDecoder: Decoder[audio.AudioAtom] = deriveDecoder
implicit val offPlatformDecoder: Decoder[audio.OffPlatform] = deriveDecoder
implicit val emailSignUpAtomDecoder: Decoder[emailsignup.EmailSignUpAtom] = deriveDecoder
implicit val multimediaSlideshowMediaReferenceDecoder: Decoder[multimediaslideshow.MediaReference] = deriveDecoder
implicit val multimediaSlideshowSlideContentDecoder: Decoder[multimediaslideshow.SlideContent] = deriveDecoder
implicit val multimediaSlideshowSlideDecoder: Decoder[multimediaslideshow.Slide] = deriveDecoder
implicit val multimediaSlideshowAtomDecoder: Decoder[multimediaslideshow.MultimediaSlideshowAtom] = deriveDecoder
implicit val atomDecoder: Decoder[contentatom.Atom] = deriveDecoder
implicit val contentChangeDetailsDecoder: Decoder[contentatom.ContentChangeDetails] = deriveDecoder
implicit val changeRecordDecoder: Decoder[contentatom.ChangeRecord] = deriveDecoder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ object CirceEncoders {
implicit val audioAtomEncoder: Encoder[audio.AudioAtom] = deriveEncoder
implicit val offPlatformEncoder: Encoder[audio.OffPlatform] = deriveEncoder
implicit val emailSignUpAtomEncoder: Encoder[emailsignup.EmailSignUpAtom] = deriveEncoder
implicit val multimediaSlideshowMediaReferenceEncoder: Encoder[multimediaslideshow.MediaReference] = deriveEncoder
implicit val multimediaSlideshowSlideContentEncoder: Encoder[multimediaslideshow.SlideContent] = deriveEncoder
implicit val multimediaSlideshowSlideEncoder: Encoder[multimediaslideshow.Slide] = deriveEncoder
implicit val multimediaSlideshowAtomEncoder: Encoder[multimediaslideshow.MultimediaSlideshowAtom] = deriveEncoder
implicit val atomEncoder: Encoder[contentatom.Atom] = deriveEncoder
implicit val contentChangeDetailsEncoder: Encoder[contentatom.ContentChangeDetails] = deriveEncoder
implicit val changeRecordEncoder: Encoder[contentatom.ChangeRecord] = deriveEncoder
Expand Down
2 changes: 2 additions & 0 deletions models/src/main/thrift/content/v1.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -1857,6 +1857,8 @@ struct Atoms {
16: optional list<contentatom.Atom> audios

17: optional list<contentatom.Atom> emailsignups

18: optional list<contentatom.Atom> multimediaslideshows
}

struct ContentStats {
Expand Down
Loading